1 files changed, 7 insertions, 10 deletions
diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp
index d9b5f6c17e..166014d4c9 100644
--- a/gm/constcolorprocessor.cpp
+++ b/gm/constcolorprocessor.cpp
@@ -57,21 +57,21 @@ protected:
             return;
         }
 
-        static const GrColor kColors[] = {
+        constexpr GrColor kColors[] = {
             0xFFFFFFFF,
             0xFFFF00FF,
             0x80000000,
             0x00000000,
         };
 
-        static const SkColor kPaintColors[] = {
+        constexpr SkColor kPaintColors[] = {
             0xFFFFFFFF,
             0xFFFF0000,
             0x80FF0000,
             0x00000000,
         };
 
-        static const char* kModeStrs[] {
+        const char* kModeStrs[] {
             "kIgnore",
             "kModulateRGBA",
             "kModulateA",
@@ -175,17 +175,14 @@ private:
     // Use this as a way of generating and input FP
     sk_sp<SkShader> fShader;
 
-    static const SkScalar       kPad;
-    static const SkScalar       kRectSize;
-    static const int            kWidth  = 820;
-    static const int            kHeight = 500;
+    static constexpr SkScalar       kPad = 10.f;
+    static constexpr SkScalar       kRectSize = 20.f;
+    static constexpr int            kWidth  = 820;
+    static constexpr int            kHeight = 500;
 
     typedef GM INHERITED;
 };
 
-const SkScalar ConstColorProcessor::kPad = 10.f;
-const SkScalar ConstColorProcessor::kRectSize = 20.f;
-
 DEF_GM(return new ConstColorProcessor;)
 }