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

1 files changed, 6 insertions, 6 deletions

diff --git a/gm/rectangletexture.cpp b/gm/rectangletexture.cpp
index 3208c0d3ba..1359d34a69 100644
--- a/gm/rectangletexture.cpp
+++ b/gm/rectangletexture.cpp
@@ -127,9 +127,9 @@ protected:
             return;
         }
 
-        static const int kWidth = 50;
-        static const int kHeight = 50;
-        static const SkScalar kPad = 5.f;
+        constexpr int kWidth = 50;
+        constexpr int kHeight = 50;
+        constexpr SkScalar kPad = 5.f;
 
         SkPMColor pixels[kWidth * kHeight];
         this->fillPixels(kWidth, kHeight, pixels);
@@ -138,19 +138,19 @@ protected:
         if (!rectImg) {
             SkPaint paint;
             paint.setAntiAlias(true);
-            static const char* kMsg = "Could not create rectangle texture image.";
+            const char* kMsg = "Could not create rectangle texture image.";
             canvas->drawText(kMsg, strlen(kMsg), 10, 100, paint);
             return;
         }
 
-        static const SkFilterQuality kQualities[] = {
+        constexpr SkFilterQuality kQualities[] = {
             kNone_SkFilterQuality,
             kLow_SkFilterQuality,
             kMedium_SkFilterQuality,
             kHigh_SkFilterQuality,
         };
 
-        static const SkScalar kScales[] = { 1.0f, 1.2f, 0.75f };
+        constexpr SkScalar kScales[] = { 1.0f, 1.2f, 0.75f };
 
         canvas->translate(kPad, kPad);
         for (auto s : kScales) {