From dbfd7ab10883f173f5c1b653a233e18dc6142002 Mon Sep 17 00:00:00 2001 From: mtklein Date: Thu, 1 Sep 2016 11:24:54 -0700 Subject: 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 --- gm/coloremoji.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gm/coloremoji.cpp') diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp index f4de3e5dce..371768c95b 100644 --- a/gm/coloremoji.cpp +++ b/gm/coloremoji.cpp @@ -20,9 +20,9 @@ * Spits out a dummy gradient to test blur with shader on paint */ static sk_sp MakeLinear() { - static const SkPoint kPts[] = { { 0, 0 }, { 32, 32 } }; - static const SkScalar kPos[] = { 0, SK_Scalar1/2, SK_Scalar1 }; - static const SkColor kColors[] = {0x80F00080, 0xF0F08000, 0x800080F0 }; + constexpr SkPoint kPts[] = { { 0, 0 }, { 32, 32 } }; + constexpr SkScalar kPos[] = { 0, SK_Scalar1/2, SK_Scalar1 }; + constexpr SkColor kColors[] = {0x80F00080, 0xF0F08000, 0x800080F0 }; return SkGradientShader::MakeLinear(kPts, kColors, kPos, SK_ARRAY_COUNT(kColors), SkShader::kClamp_TileMode); } @@ -77,7 +77,7 @@ protected: const char* text = emojiFont.text; // draw text at different point sizes - static constexpr SkScalar textSizes[] = { 10, 30, 50, }; + constexpr SkScalar textSizes[] = { 10, 30, 50, }; SkPaint::FontMetrics metrics; SkScalar y = 0; for (const SkScalar& textSize : textSizes) { @@ -137,7 +137,7 @@ protected: SkRect interiorClip = bounds; interiorClip.inset(boundsQuarterWidth, boundsQuarterHeight); - static const SkRect clipRects[] = { bounds, upperLeftClip, lowerRightClip, interiorClip }; + const SkRect clipRects[] = { bounds, upperLeftClip, lowerRightClip, interiorClip }; SkPaint clipHairline; clipHairline.setColor(SK_ColorWHITE); -- cgit v1.2.3