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

gm/megalooper.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 50 matching lines @@
                     case k1x4_Type:     // fall through
                     default:
                         draw1x4(canvas, SkIntToScalar(x), SkIntToScalar(y));
                         break;
                 }
             }
         }
     }
 
 private:
-    static const int kWidth = 800;
-    static const int kHeight = 800;
-    static const int kHalfOuterClipSize = 100;
-    static const int kHalfSquareSize = 50;
-    static const int kOffsetToOutsideClip = kHalfSquareSize + kHalfOuterClipSize + 1;
+    static constexpr int kWidth = 800;
+    static constexpr int kHeight = 800;
+    static constexpr int kHalfOuterClipSize = 100;
+    static constexpr int kHalfSquareSize = 50;
+    static constexpr int kOffsetToOutsideClip = kHalfSquareSize + kHalfOuterClipSize + 1;
 
     static const SkPoint gBlurOffsets[4];
     static const SkColor gColors[4];
     Type fType;
 
     // Just draw a blurred rect at each of the four corners of a square (centered at x,y).
     // Use two clips to define a rectori where we want pixels to appear.
     void draw0x0(SkCanvas* canvas, SkScalar x, SkScalar y) {
         SkRect innerClip = { -kHalfSquareSize, -kHalfSquareSize, kHalfSquareSize, kHalfSquareSize };
         innerClip.offset(x, y);
@@ skipping 18 matching lines @@
             SkRect rect = { -kHalfSquareSize, -kHalfSquareSize, kHalfSquareSize, kHalfSquareSize };
             rect.offset(gBlurOffsets[i]);
             rect.offset(x, y);
             canvas->drawRect(rect, paint);
         }
 
         canvas->restore();
     }
 
     static sk_sp<SkMaskFilter> MakeBlur() {
-        static const SkScalar kBlurSigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(25));
+        const SkScalar kBlurSigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(25));
 
         return SkBlurMaskFilter::Make(kNormal_SkBlurStyle, kBlurSigma,
                                       SkBlurMaskFilter::kHighQuality_BlurFlag);
     }
 
     // This draws 4 blurred shadows around a single square (centered at x, y).
     // Each blur is offset +/- half the square's side in x & y from the original
     // (so each blurred rect is centered at one of the corners of the original).
     // For each blur a large outer clip is centered around the blurred rect
     // while a difference clip stays at the location of the original rect.
@@ skipping 113 matching lines @@
     { -kHalfSquareSize, -kHalfSquareSize }
 };
 
 const SkColor MegaLooperGM::gColors[4] = {
     SK_ColorGREEN, SK_ColorYELLOW, SK_ColorBLUE, SK_ColorRED
 };
 
 DEF_GM( return new MegaLooperGM(MegaLooperGM::k0x0_Type); )
 DEF_GM( return new MegaLooperGM(MegaLooperGM::k4x1_Type); )
 DEF_GM( return new MegaLooperGM(MegaLooperGM::k1x4_Type); )