Replace a lot of 'static const' with 'constexpr' or 'const'.

gm/polygons.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
@@ skipping 80 matching lines @@
         paint->setColor(color);
         if (40 == paint->getStrokeWidth()) {
             paint->setAlpha(0xA0);
         }
     }
 
     void onDraw(SkCanvas* canvas) override {
         // Stroke widths are:
         // 0(may use hairline rendering), 10(common case for stroke-style)
         // 40(>= geometry width/height, make the contour filled in fact)
-        static const int kStrokeWidths[] = {0, 10, 40};
+        constexpr int kStrokeWidths[] = {0, 10, 40};
         SkASSERT(kNumStrokeWidths == SK_ARRAY_COUNT(kStrokeWidths));
 
-        static const SkPaint::Join kJoins[] = {
+        constexpr SkPaint::Join kJoins[] = {
             SkPaint::kMiter_Join, SkPaint::kRound_Join, SkPaint::kBevel_Join
         };
         SkASSERT(kNumJoins == SK_ARRAY_COUNT(kJoins));
 
         int counter = 0;
         SkPaint paint;
         paint.setAntiAlias(true);
 
         SkRandom rand;
         // For stroke style painter
         paint.setStyle(SkPaint::kStroke_Style);
         for (int join = 0; join < kNumJoins; ++join) {
             for (int width = 0; width < kNumStrokeWidths; ++width) {
                 for (int i = 0; i < fPolygons.count(); ++i) {
                     canvas->save();
                     SetLocation(canvas, counter, fPolygons.count());
 
                     SetColorAndAlpha(&paint, &rand);
                     paint.setStrokeJoin(kJoins[join]);
                     paint.setStrokeWidth(SkIntToScalar(kStrokeWidths[width]));
 
                     canvas->drawPath(fPolygons[i], paint);
                     canvas->restore();
                     ++counter;
                 }
             }
         }
 
         // For stroke-and-fill style painter and fill style painter
-        static const SkPaint::Style kStyles[] = {
+        constexpr SkPaint::Style kStyles[] = {
             SkPaint::kStrokeAndFill_Style, SkPaint::kFill_Style
         };
         SkASSERT(kNumExtraStyles == SK_ARRAY_COUNT(kStyles));
 
         paint.setStrokeJoin(SkPaint::kMiter_Join);
         paint.setStrokeWidth(SkIntToScalar(20));
         for (int style = 0; style < kNumExtraStyles; ++style) {
             paint.setStyle(kStyles[style]);
             for (int i = 0; i < fPolygons.count(); ++i) {
                 canvas->save();
                 SetLocation(canvas, counter, fPolygons.count());
                 SetColorAndAlpha(&paint, &rand);
                 canvas->drawPath(fPolygons[i], paint);
                 canvas->restore();
                 ++counter;
             }
         }
     }
 
 private:
-    static const int kNumPolygons = 8;
-    static const int kCellSize = 100;
-    static const int kNumExtraStyles = 2;
-    static const int kNumStrokeWidths = 3;
-    static const int kNumJoins = 3;
+    static constexpr int kNumPolygons = 8;
+    static constexpr int kCellSize = 100;
+    static constexpr int kNumExtraStyles = 2;
+    static constexpr int kNumStrokeWidths = 3;
+    static constexpr int kNumJoins = 3;
 
     SkTArray<SkPath> fPolygons;
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new PolygonsGM;)
 
 }