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

gm/dcshader.cpp

 /*
  * Copyright 2014 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"
 #if SK_SUPPORT_GPU
 #include "GrFragmentProcessor.h"
@@ skipping 114 matching lines @@
         struct Rect : public Prim {
             SkRect draw(SkCanvas* canvas, const SkPaint& paint) override {
                 SkRect rect = SkRect::MakeXYWH(0, 0, 50, 50);
                 canvas->drawRect(rect, paint);
                 return rect;
             }
         };
 
         struct Circle : public Prim {
             SkRect draw(SkCanvas* canvas, const SkPaint& paint) override {
-                static const SkScalar radius = 25;
+                constexpr SkScalar radius = 25;
                 canvas->drawCircle(radius, radius, radius, paint);
                 return SkRect::MakeXYWH(0, 0, 2 * radius, 2 * radius);
             }
         };
 
         struct RRect : public Prim {
             SkRect draw(SkCanvas* canvas, const SkPaint& paint) override {
                 SkRRect rrect;
                 rrect.setRectXY(SkRect::MakeXYWH(0, 0, 50, 50), 10, 10);
                 canvas->drawRRect(rrect, paint);
@@ skipping 42 matching lines @@
             }
             SkCanvas::PointMode fMode;
         };
 
         struct Text : public Prim {
             SkRect draw(SkCanvas* canvas, const SkPaint& origPaint) override {
                 SkPaint paint = origPaint;
                 paint.setTextSize(30.f);
                 this->setFont(&paint);
                 const char* text = this->text();
-                static const SkVector offset = SkVector::Make(10, 10);
+                const SkVector offset = SkVector::Make(10, 10);
                 canvas->drawText(text, strlen(text), offset.fX, offset.fY, paint);
                 SkRect bounds;
                 paint.measureText(text, strlen(text), &bounds);
                 bounds.offset(offset);
                 return bounds;
             }
 
             virtual void setFont(SkPaint* paint) {
                 sk_tool_utils::set_portable_typeface(paint);
             }
@@ skipping 29 matching lines @@
 
 
         SkTArray<SkMatrix> viewMats;
         viewMats.push_back().setScale(0.75f, 0.75f);
         viewMats.push_back().setRotate(45, 50, 50);
         viewMats.back().postScale(0.5f, 1.1f);
 
         canvas->translate(10, 20);
         canvas->save();
         SkScalar tx = 0, maxTy = 0;
-        static const SkScalar kW = 900;
+        constexpr SkScalar kW = 900;
 
         for (int aa = 0; aa < 2; ++aa) {
             for (int i = 0; i < fPrims.count(); ++i) {
                 for (int j = 0; j < devMats.count(); ++j) {
                     for (int k = 0; k < viewMats.count(); ++k) {
                         paint.setShader(sk_make_sp<DCShader>(devMats[j]));
                         paint.setAntiAlias(SkToBool(aa));
                         canvas->save();
                         canvas->concat(viewMats[k]);
                         SkRect bounds = fPrims[i]->draw(canvas, paint);
@@ skipping 26 matching lines @@
     };
 
     SkTArray<Prim*> fPrims;
 
     typedef GM INHERITED;
 };
 
 DEF_GM(return new DCShaderGM;)
 }
 #endif