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, 4 insertions, 4 deletions

diff --git a/gm/pictureimagegenerator.cpp b/gm/pictureimagegenerator.cpp
index 60e979fc3c..95efbb2055 100644
--- a/gm/pictureimagegenerator.cpp
+++ b/gm/pictureimagegenerator.cpp
@@ -16,10 +16,10 @@
 #include "SkPictureRecorder.h"
 
 static void draw_vector_logo(SkCanvas* canvas, const SkRect& viewBox) {
-    static const char kSkiaStr[] = "SKIA";
-    static const SkScalar kGradientPad = .1f;
-    static const SkScalar kVerticalSpacing = 0.25f;
-    static const SkScalar kAccentScale = 1.20f;
+    constexpr char kSkiaStr[] = "SKIA";
+    constexpr SkScalar kGradientPad = .1f;
+    constexpr SkScalar kVerticalSpacing = 0.25f;
+    constexpr SkScalar kAccentScale = 1.20f;
 
     SkPaint paint;
     paint.setAntiAlias(true);