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

gm/bigblurs.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 "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
@@ skipping 14 matching lines @@
 protected:
     SkString onShortName() override {
         return SkString("bigblurs");
     }
 
     SkISize onISize() override {
         return SkISize::Make(kWidth, kHeight);
     }
 
     void onDraw(SkCanvas* canvas) override {
-        static const int kBig = 65536;
-        static const SkScalar kSigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(4));
+        constexpr int kBig = 65536;
+        const SkScalar kSigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(4));
 
         const SkRect bigRect = SkRect::MakeWH(SkIntToScalar(kBig), SkIntToScalar(kBig));
         SkRect insetRect = bigRect;
         insetRect.inset(20, 20);
 
         SkPath rectori;
 
         rectori.addRect(bigRect);
         rectori.addRect(insetRect, SkPath::kCCW_Direction);
 
         // The blur extends 3*kSigma out from the big rect.
         // Offset the close-up windows so we get the entire blur
-        static const SkScalar kLeftTopPad  = 3*kSigma;   // use on left & up of big rect
-        static const SkScalar kRightBotPad = kCloseUpSize-3*kSigma; // use on right and bot sides
+        const SkScalar kLeftTopPad  = 3*kSigma;   // use on left & up of big rect
+        const SkScalar kRightBotPad = kCloseUpSize-3*kSigma; // use on right and bot sides
 
         // UL hand corners of the rendered closeups
         const SkPoint origins[] = {
             { -kLeftTopPad,          -kLeftTopPad           }, // UL
             {  kBig-kRightBotPad,    -kLeftTopPad           }, // UR
             {  kBig-kRightBotPad,     kBig-kRightBotPad     }, // LR
             { -kLeftTopPad,           kBig-kRightBotPad     }, // LL
             {  kBig/2-kCloseUpSize/2, kBig/2-kCloseUpSize/2 }, // center
         };
 
@@ skipping 35 matching lines @@
                     desiredX += kCloseUpSize;
                 }
 
                 desiredX = 0;
                 desiredY += kCloseUpSize;
             }
         }
     }
 
 private:
-    static const int kCloseUpSize = 64;
-    static const int kWidth = 5 * kCloseUpSize;
-    static const int kHeight = 2 * (kLastEnum_SkBlurStyle + 1) * kCloseUpSize;
+    static constexpr int kCloseUpSize = 64;
+    static constexpr int kWidth = 5 * kCloseUpSize;
+    static constexpr int kHeight = 2 * (kLastEnum_SkBlurStyle + 1) * kCloseUpSize;
 
     typedef GM INHERITED;
 };
 
 DEF_GM(return new BigBlursGM;)
 }