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/dashing.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/dashing.cpp')
-rw-r--r-- | gm/dashing.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gm/dashing.cpp b/gm/dashing.cpp index 82e6eb35bf..e23c24ed3b 100644 --- a/gm/dashing.cpp +++ b/gm/dashing.cpp @@ -57,7 +57,7 @@ protected: SkISize onISize() { return SkISize::Make(640, 340); } virtual void onDraw(SkCanvas* canvas) { - static const struct { + constexpr struct { int fOnInterval; int fOffInterval; } gData[] = { @@ -145,7 +145,7 @@ protected: SkISize onISize() { return SkISize::Make(640, 480); } virtual void onDraw(SkCanvas* canvas) { - static const int gIntervals[] = { + constexpr int gIntervals[] = { 3, // 3 dashes: each count [0] followed by intervals [1..count] 2, 10, 10, 4, 20, 5, 5, 5, @@ -334,7 +334,7 @@ protected: SkISize onISize() { return SkISize::Make(640, 950); } virtual void onDraw(SkCanvas* canvas) { - static const struct { + constexpr struct { int fOnInterval; int fOffInterval; } gData[] = { @@ -420,11 +420,11 @@ protected: SkISize onISize() override { return SkISize::Make(400, 200); } void onDraw(SkCanvas* canvas) override { - static const int kOn = 4; - static const int kOff = 4; - static const int kIntervalLength = kOn + kOff; + constexpr int kOn = 4; + constexpr int kOff = 4; + constexpr int kIntervalLength = kOn + kOff; - static const SkColor gColors[kIntervalLength] = { + constexpr SkColor gColors[kIntervalLength] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, |