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

gm/blurcircles2.cpp

 /*
 * Copyright 2016 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 "SkAnimTimer.h"
 #include "SkBlurMask.h"
@@ skipping 26 matching lines @@
 protected:
     bool runAsBench() const override { return true; }
 
     SkString onShortName() override { return SkString("blurcircles2"); }
 
     SkISize onISize() override {
         return SkISize::Make(730, 1350);
     }
 
     void onDraw(SkCanvas* canvas) override {
-        static constexpr SkScalar kMaxR = kMaxRadius + kMaxBlurRadius;
+        constexpr SkScalar kMaxR = kMaxRadius + kMaxBlurRadius;
 
         auto almostCircleMaker = [] (SkScalar radius, SkPath* dst) {
             dst->reset();
             dst->addArc(SkRect::MakeXYWH(-radius, -radius, 2 * radius, 2 * radius), 0, 355);
             dst->setIsVolatile(true);
             dst->close();
         };
 
         auto blurMaker = [] (SkScalar radius) ->sk_sp<SkMaskFilter> {
             return SkBlurMaskFilter::Make(kNormal_SkBlurStyle,
@@ skipping 11 matching lines @@
             almostCircleMaker(fAnimRadius, &almostCircle);
             canvas->save();
                 canvas->translate(size.fWidth / 2.f, size.fHeight / 4.f);
                 canvas->drawCircle(0, 0, fAnimRadius, paint);
                 canvas->translate(0, 2 * kMaxR);
                 canvas->drawPath(almostCircle, paint);
             canvas->restore();
         } else {
             bool benchMode = this->getMode() == kBench_Mode;
             canvas->save();
-            static constexpr SkScalar kPad = 5;
-            static constexpr SkScalar kRadiusSteps = 5;
-            static constexpr SkScalar kBlurRadiusSteps = 5;
+            constexpr SkScalar kPad = 5;
+            constexpr SkScalar kRadiusSteps = 5;
+            constexpr SkScalar kBlurRadiusSteps = 5;
             canvas->translate(kPad + kMinRadius + kMaxBlurRadius,
                               kPad + kMinRadius + kMaxBlurRadius);
-            static constexpr SkScalar kDeltaRadius = (kMaxRadius - kMinRadius) / kRadiusSteps;
-            static constexpr SkScalar kDeltaBlurRadius = (kMaxBlurRadius - kMinBlurRadius) /
+            constexpr SkScalar kDeltaRadius = (kMaxRadius - kMinRadius) / kRadiusSteps;
+            constexpr SkScalar kDeltaBlurRadius = (kMaxBlurRadius - kMinBlurRadius) /
                                                          kBlurRadiusSteps;
             SkScalar lineWidth = 0;
             if (!benchMode) {
                 for (int r = 0; r < kRadiusSteps - 1; ++r) {
                     const SkScalar radius = r * kDeltaRadius + kMinRadius;
                     lineWidth += 2 * (radius + kMaxBlurRadius) + kPad;
                 }
             }
             for (int br = 0; br < kBlurRadiusSteps; ++br) {
                 SkScalar blurRadius = br * kDeltaBlurRadius + kMinBlurRadius;
@@ skipping 58 matching lines @@
 
     SkScalar    fAnimRadius;
     SkScalar    fAnimBlurRadius;
 
     SkRandom    fRandom;
 
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM(return new BlurCircles2GM();)