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/megalooper.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/megalooper.cpp')
-rw-r--r-- | gm/megalooper.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gm/megalooper.cpp b/gm/megalooper.cpp index 385c60efb1..6f071cb72c 100644 --- a/gm/megalooper.cpp +++ b/gm/megalooper.cpp @@ -68,11 +68,11 @@ protected: } private: - static const int kWidth = 800; - static const int kHeight = 800; - static const int kHalfOuterClipSize = 100; - static const int kHalfSquareSize = 50; - static const int kOffsetToOutsideClip = kHalfSquareSize + kHalfOuterClipSize + 1; + static constexpr int kWidth = 800; + static constexpr int kHeight = 800; + static constexpr int kHalfOuterClipSize = 100; + static constexpr int kHalfSquareSize = 50; + static constexpr int kOffsetToOutsideClip = kHalfSquareSize + kHalfOuterClipSize + 1; static const SkPoint gBlurOffsets[4]; static const SkColor gColors[4]; @@ -111,7 +111,7 @@ private: } static sk_sp<SkMaskFilter> MakeBlur() { - static const SkScalar kBlurSigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(25)); + const SkScalar kBlurSigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(25)); return SkBlurMaskFilter::Make(kNormal_SkBlurStyle, kBlurSigma, SkBlurMaskFilter::kHighQuality_BlurFlag); |