diff options
author | mtklein <mtklein@chromium.org> | 2016-09-01 11:24:54 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-09-01 11:24:54 -0700 |
commit | dbfd7ab10883f173f5c1b653a233e18dc6142002 (patch) | |
tree | a69ab168400f1d270d6047e1d8edf956cb6e5442 /gm/stroke_rect_shader.cpp | |
parent | 0b629ec73210161a6ba869a44a3c4ffd5a27dab9 (diff) |
Replace a lot of 'static const' with 'constexpr' or 'const'.
'static const' means, there must be at most one of these, and initialize it at
compile time if possible or runtime if necessary. This leads to unexpected
code execution, and TSAN* will complain about races on the guard variables.
Generally 'constexpr' or 'const' are better choices. Neither can cause races:
they're either intialized at compile time (constexpr) or intialized each time
independently (const).
This CL prefers constexpr where possible, and uses const where not. It even
prefers constexpr over const where they don't make a difference... I want to have
lots of examples of constexpr for people to see and mimic.
The scoped-to-class static has nothing to do with any of this, and is not changed.
* Not yet on the bots, which use an older TSAN.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2300623005
Review-Url: https://codereview.chromium.org/2300623005
Diffstat (limited to 'gm/stroke_rect_shader.cpp')
-rw-r--r-- | gm/stroke_rect_shader.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/stroke_rect_shader.cpp b/gm/stroke_rect_shader.cpp index 0eb09e9a6f..1826f629f6 100644 --- a/gm/stroke_rect_shader.cpp +++ b/gm/stroke_rect_shader.cpp @@ -14,9 +14,9 @@ namespace skiagm { // bevel, miter, miter-limited-to-bevel, round // and as a hairline. DEF_SIMPLE_GM(stroke_rect_shader, canvas, 690, 300) { - static constexpr SkRect kRect {0, 0, 100, 100}; - static constexpr SkPoint kPts[] {{kRect.fLeft, kRect.fTop}, {kRect.fRight, kRect.fBottom}}; - static constexpr SkColor kColors[] {SK_ColorRED, SK_ColorBLUE}; + constexpr SkRect kRect {0, 0, 100, 100}; + constexpr SkPoint kPts[] {{kRect.fLeft, kRect.fTop}, {kRect.fRight, kRect.fBottom}}; + constexpr SkColor kColors[] {SK_ColorRED, SK_ColorBLUE}; SkPaint paint; sk_sp<SkShader> shader = SkGradientShader::MakeLinear(kPts, kColors, nullptr, 2, SkShader::kClamp_TileMode); @@ -25,12 +25,12 @@ DEF_SIMPLE_GM(stroke_rect_shader, canvas, 690, 300) { // Do a large initial translate so that local coords disagree with device coords significantly // for the first rect drawn. canvas->translate(kRect.centerX(), kRect.centerY()); - static constexpr SkScalar kPad = 20; + constexpr SkScalar kPad = 20; for (auto aa : {false, true}) { paint.setAntiAlias(aa); canvas->save(); - static constexpr SkScalar kStrokeWidth = 10; + constexpr SkScalar kStrokeWidth = 10; paint.setStrokeWidth(kStrokeWidth); paint.setStrokeJoin(SkPaint::kBevel_Join); |