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
diff --git a/gm/perspshaders.cpp b/gm/perspshaders.cpp
index 2b09cc6..b231291 100644
--- a/gm/perspshaders.cpp
+++ b/gm/perspshaders.cpp
@@ -56,10 +56,10 @@
{ 0, 0 },
{ 0, SkIntToScalar(kCellSize) }
};
- static const SkColor colors[] = {
+ constexpr SkColor colors[] = {
SK_ColorRED, SK_ColorGREEN, SK_ColorRED, SK_ColorGREEN, SK_ColorRED
};
- static const SkScalar pos[] = { 0, 0.25f, 0.5f, 0.75f, SK_Scalar1 };
+ constexpr SkScalar pos[] = { 0, 0.25f, 0.5f, 0.75f, SK_Scalar1 };
fLinearGrad1 = SkGradientShader::MakeLinear(pts1, colors, pos, SK_ARRAY_COUNT(colors),
SkShader::kClamp_TileMode);
@@ -151,9 +151,9 @@
canvas->translate(0, SkIntToScalar(kCellSize));
}
private:
- static const int kCellSize = 50;
- static const int kNumRows = 4;
- static const int kNumCols = 6;
+ static constexpr int kCellSize = 50;
+ static constexpr int kNumRows = 4;
+ static constexpr int kNumCols = 6;
bool fDoAA;
SkPath fPath;