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

gm/distantclip.cpp

 
 /*
  * Copyright 2012 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 "SkCanvas.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
 
 namespace skiagm {
 
 class DistantClipGM : public GM {
 public:
     DistantClipGM() { }
 
 protected:
 
     SkString onShortName() {
         return SkString("distantclip");
     }
 
     SkISize onISize() { return SkISize::Make(100, 100); }
 
     virtual void onDraw(SkCanvas* canvas) {
-        static const SkScalar kOffset = 35000.0f;
-        static const SkScalar kExtents = 1000.0f;
+        constexpr SkScalar kOffset = 35000.0f;
+        constexpr SkScalar kExtents = 1000.0f;
 
         SkPictureRecorder recorder;
         // We record a picture of huge vertical extents in which we clear the canvas to red, create
         // a 'extents' by 'extents' round rect clip at a vertical offset of 'offset', then draw
         // green into that.
         SkCanvas* rec = recorder.beginRecording(kExtents, kOffset + kExtents, nullptr, 0);
         rec->drawColor(SK_ColorRED);
         rec->save();
         SkRect r = SkRect::MakeXYWH(-kExtents, kOffset - kExtents, 2 * kExtents, 2 * kExtents);
         SkPath p;
@@ skipping 22 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new DistantClipGM; }
 static GMRegistry reg(MyFactory);
 
 }