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/pixelsnap.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/pixelsnap.cpp')
| -rw-r--r-- | gm/pixelsnap.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gm/pixelsnap.cpp b/gm/pixelsnap.cpp index 1711f5e36d..18fb7b2b75 100644 --- a/gm/pixelsnap.cpp +++ b/gm/pixelsnap.cpp @@ -17,15 +17,15 @@ public: protected: // kTrans should be even or checkboards wont agree in different test cases. - static const int kTrans = 14; - static const int kLabelPad = 4; + static constexpr int kTrans = 14; + static constexpr int kLabelPad = 4; // The inverse of this value should be a perfect SkScalar. - static const int kSubPixelSteps = 8; - static const int kLabelTextSize = 9; + static constexpr int kSubPixelSteps = 8; + static constexpr int kLabelTextSize = 9; static_assert(kSubPixelSteps < 99, "label_offset_too_small"); - static const int kLabelOffsetX = 2 * kLabelTextSize + kLabelPad; - static const int kLabelOffsetY = kLabelTextSize + kLabelPad; + static constexpr int kLabelOffsetX = 2 * kLabelTextSize + kLabelPad; + static constexpr int kLabelOffsetY = kLabelTextSize + kLabelPad; SkISize onISize() override { return SkISize::Make((kSubPixelSteps + 1) * kTrans + kLabelOffsetX + kLabelPad, |