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

gm/drawbitmaprect.cpp

 /*
  * Copyright 2011 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 113 matching lines @@
     }
 
     if (sk_sp<SkImage> subset = image->makeSubset(srcR)) {
         canvas->drawImageRect(subset, dstR, paint);
     }
 }
 
 typedef void DrawRectRectProc(SkCanvas*, SkImage*, const SkBitmap&, const SkIRect&, const SkRect&,
                               const SkPaint*);
 
-static const int gSize = 1024;
-static const int gBmpSize = 2048;
+constexpr int gSize = 1024;
+constexpr int gBmpSize = 2048;
 
 class DrawBitmapRectGM : public skiagm::GM {
 public:
     DrawBitmapRectGM(DrawRectRectProc proc, const char suffix[]) : fProc(proc) {
         fName.set("drawbitmaprect");
         if (suffix) {
             fName.append(suffix);
         }
     }
 
@@ skipping 10 matching lines @@
     void setupImage(SkCanvas* canvas) {
         fImage = makebm(canvas, &fLargeBitmap, gBmpSize, gBmpSize);
     }
 
     void onDraw(SkCanvas* canvas) override {
         if (!fImage) {
             this->setupImage(canvas);
         }
 
         SkRect dstRect = { 0, 0, SkIntToScalar(64), SkIntToScalar(64)};
-        static const int kMaxSrcRectSize = 1 << (SkNextLog2(gBmpSize) + 2);
+        const int kMaxSrcRectSize = 1 << (SkNextLog2(gBmpSize) + 2);
 
-        static const int kPadX = 30;
-        static const int kPadY = 40;
+        const int kPadX = 30;
+        const int kPadY = 40;
         SkPaint paint;
         paint.setAlpha(0x20);
         canvas->drawImageRect(fImage, SkRect::MakeIWH(gSize, gSize), &paint);
         canvas->translate(SK_Scalar1 * kPadX / 2,
                           SK_Scalar1 * kPadY / 2);
         SkPaint blackPaint;
         SkScalar titleHeight = SK_Scalar1 * 24;
         blackPaint.setColor(SK_ColorBLACK);
         blackPaint.setTextSize(titleHeight);
         blackPaint.setAntiAlias(true);
@@ skipping 60 matching lines @@
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM( return new DrawBitmapRectGM(bitmapproc      , nullptr); )
 DEF_GM( return new DrawBitmapRectGM(bitmapsubsetproc, "-subset"); )
 DEF_GM( return new DrawBitmapRectGM(imageproc       , "-imagerect"); )
 DEF_GM( return new DrawBitmapRectGM(imagesubsetproc , "-imagerect-subset"); )