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

gm/image.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 <functional>
 #include "gm.h"
 #include "SkAutoPixmapStorage.h"
@@ skipping 114 matching lines @@
 
     SkISize onISize() override {
         return SkISize::Make(960, 1200);
     }
 
     void onDraw(SkCanvas* canvas) override {
         drawJpeg(canvas, this->getISize());
 
         canvas->scale(2, 2);
 
-        static const char* kLabel1 = "Original Img";
-        static const char* kLabel2 = "Modified Img";
-        static const char* kLabel3 = "Cur Surface";
-        static const char* kLabel4 = "Full Crop";
-        static const char* kLabel5 = "Over-crop";
-        static const char* kLabel6 = "Upper-left";
-        static const char* kLabel7 = "No Crop";
+        const char* kLabel1 = "Original Img";
+        const char* kLabel2 = "Modified Img";
+        const char* kLabel3 = "Cur Surface";
+        const char* kLabel4 = "Full Crop";
+        const char* kLabel5 = "Over-crop";
+        const char* kLabel6 = "Upper-left";
+        const char* kLabel7 = "No Crop";
 
-        static const char* kLabel8 = "Pre-Alloc Img";
-        static const char* kLabel9 = "New Alloc Img";
-        static const char* kLabel10 = "GPU";
+        const char* kLabel8 = "Pre-Alloc Img";
+        const char* kLabel9 = "New Alloc Img";
+        const char* kLabel10 = "GPU";
 
         SkPaint textPaint;
         textPaint.setAntiAlias(true);
         sk_tool_utils::set_portable_typeface(&textPaint);
         textPaint.setTextSize(8);
 
         canvas->drawText(kLabel1, strlen(kLabel1), 10,  60, textPaint);
         canvas->drawText(kLabel2, strlen(kLabel2), 10, 140, textPaint);
         canvas->drawText(kLabel3, strlen(kLabel3), 10, 220, textPaint);
         canvas->drawText(kLabel4, strlen(kLabel4), 10, 300, textPaint);
@@ skipping 290 matching lines @@
         paint.setColor(SK_ColorRED);
         canvas->drawRect(SkRect::MakeXYWH(10.f,10.f,10.f,10.f), paint);
         paint.setColor(SK_ColorGREEN);
         canvas->drawRect(SkRect::MakeXYWH(30.f,10.f,10.f,10.f), paint);
         paint.setColor(SK_ColorYELLOW);
         canvas->drawRect(SkRect::MakeXYWH(10.f,30.f,10.f,10.f), paint);
         paint.setColor(SK_ColorCYAN);
         canvas->drawRect(SkRect::MakeXYWH(30.f,30.f,10.f,10.f), paint);
     };
 
-    static const int kSize = 50;
+    static constexpr int kSize = 50;
     SkBitmap bmp;
     bmp.allocN32Pixels(kSize, kSize);
     SkCanvas bmpCanvas(bmp);
     render_image(&bmpCanvas);
 
     std::function<sk_sp<SkImage>()> imageFactories[] = {
         // Create sw raster image.
         [bmp] {
             return SkImage::MakeFromBitmap(bmp);
         },
@@ skipping 17 matching lines @@
                 SkSurface::MakeRenderTarget(context, SkBudgeted::kYes,
                                             SkImageInfo::MakeN32Premul(kSize, kSize)));
             if (!surface) {
                 return nullptr;
             }
             render_image(surface->getCanvas());
             return surface->makeImageSnapshot();
         }
     };
 
-    static const SkScalar kPad = 5.f;
+    constexpr SkScalar kPad = 5.f;
     canvas->translate(kPad, kPad);
     for (auto factory : imageFactories) {
         auto image(factory());
         if (!image) {
             continue;
         }
         if (context) {
             sk_sp<SkImage> texImage(image->makeTextureImage(context));
             if (texImage) {
                 canvas->drawImage(texImage, 0, 0);
             }
         }
         canvas->translate(image->width() + kPad, 0);
     }
 }