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

gm/anisotropic.cpp

 /*
  * Copyright 2015 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"
 
 namespace skiagm {
 
 // This GM exercises HighQuality anisotropic filtering.
 class AnisotropicGM : public GM {
 public:
     AnisotropicGM() : fFilterQuality(kHigh_SkFilterQuality) {
         this->setBGColor(sk_tool_utils::color_to_565(0xFFCCCCCC));
     }
 
 protected:
 
     SkString onShortName() override { return SkString("anisotropic_hq"); }
 
     SkISize onISize() override {
         return SkISize::Make(2*kImageSize + 3*kSpacer,
                              kNumVertImages*kImageSize + (kNumVertImages+1)*kSpacer);
     }
 
     // Create an image consisting of lines radiating from its center
     void onOnceBeforeDraw() override {
-        static const int kNumLines = 100;
-        static const SkScalar kAngleStep = 360.0f / kNumLines;
-        static const int kInnerOffset = 10;
+        constexpr int kNumLines = 100;
+        constexpr SkScalar kAngleStep = 360.0f / kNumLines;
+        constexpr int kInnerOffset = 10;
 
         fBM.allocN32Pixels(kImageSize, kImageSize, true);
 
         SkCanvas canvas(fBM);
 
         canvas.clear(SK_ColorWHITE);
 
         SkPaint p;
         p.setAntiAlias(true);
 
@@ skipping 47 matching lines @@
                 // Position the more highly squashed images with their less squashed counterparts
                 xOff = fBM.width() + 2*kSpacer + fBM.width() - width;
                 yOff = kSpacer + (SK_ARRAY_COUNT(gScales) - i - 1) * (fBM.height() + kSpacer);
             }
 
             this->draw(canvas, xOff, yOff, width, fBM.height());
         }
     }
 
 private:
-    static const int kImageSize     = 256;
-    static const int kSpacer        = 10;
-    static const int kNumVertImages = 5;
+    static constexpr int kImageSize     = 256;
+    static constexpr int kSpacer        = 10;
+    static constexpr int kNumVertImages = 5;
 
     SkBitmap         fBM;
     SkFilterQuality  fFilterQuality;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new AnisotropicGM;)
 }