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

gm/gradient_matrix.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkGradientShader.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
 #include "SkPoint.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkScalar.h"
 #include "SkSize.h"
 #include "SkString.h"
 
 #include "gm.h"
 
-static const SkColor gColors[] = {
+constexpr SkColor gColors[] = {
     SK_ColorRED, SK_ColorYELLOW
 };
 
 // These annoying defines are necessary, because the only other alternative
 // is to use SkIntToScalar(...) everywhere.
-static const SkScalar sZero = 0;
-static const SkScalar sHalf = SK_ScalarHalf;
-static const SkScalar sOne = SK_Scalar1;
+constexpr SkScalar sZero = 0;
+constexpr SkScalar sHalf = SK_ScalarHalf;
+constexpr SkScalar sOne = SK_Scalar1;
 
 // These arrays define the gradient stop points
 // as x1, y1, x2, y2 per gradient to draw.
-static const SkPoint linearPts[][2] = {
+constexpr SkPoint linearPts[][2] = {
     {{sZero, sZero}, {sOne,  sZero}},
     {{sZero, sZero}, {sZero, sOne}},
     {{sOne,  sZero}, {sZero, sZero}},
     {{sZero, sOne},  {sZero, sZero}},
 
     {{sZero, sZero}, {sOne,  sOne}},
     {{sOne,  sOne},  {sZero, sZero}},
     {{sOne,  sZero}, {sZero, sOne}},
     {{sZero, sOne},  {sOne,  sZero}}
 };
 
-static const SkPoint radialPts[][2] = {
+constexpr SkPoint radialPts[][2] = {
     {{sZero, sHalf}, {sOne,  sHalf}},
     {{sHalf, sZero}, {sHalf, sOne}},
     {{sOne,  sHalf}, {sZero, sHalf}},
     {{sHalf, sOne},  {sHalf, sZero}},
 
     {{sZero, sZero}, {sOne,  sOne}},
     {{sOne,  sOne},  {sZero, sZero}},
     {{sOne,  sZero}, {sZero, sOne}},
     {{sZero, sOne},  {sOne,  sZero}}
 };
 
 // These define the pixels allocated to each gradient image.
-static const SkScalar TESTGRID_X = SkIntToScalar(200);
-static const SkScalar TESTGRID_Y = SkIntToScalar(200);
+constexpr SkScalar TESTGRID_X = SkIntToScalar(200);
+constexpr SkScalar TESTGRID_Y = SkIntToScalar(200);
 
-static const int IMAGES_X = 4;             // number of images per row
+constexpr int IMAGES_X = 4;             // number of images per row
 
 static sk_sp<SkShader> make_linear_gradient(const SkPoint pts[2], const SkMatrix& localMatrix) {
     return SkGradientShader::MakeLinear(pts, gColors, nullptr, SK_ARRAY_COUNT(gColors),
                                         SkShader::kClamp_TileMode, 0, &localMatrix);
 }
 
 static sk_sp<SkShader> make_radial_gradient(const SkPoint pts[2], const SkMatrix& localMatrix) {
     SkPoint center;
     center.set(SkScalarAve(pts[0].fX, pts[1].fX),
                SkScalarAve(pts[0].fY, pts[1].fY));
@@ skipping 38 matching lines @@
 DEF_SIMPLE_GM_BG(gradient_matrix, canvas, 800, 800,
                  sk_tool_utils::color_to_565(0xFFDDDDDD)) {
         draw_gradients(canvas, &make_linear_gradient,
                       linearPts, SK_ARRAY_COUNT(linearPts));
 
         canvas->translate(0, TESTGRID_Y);
 
         draw_gradients(canvas, &make_radial_gradient,
                       radialPts, SK_ARRAY_COUNT(radialPts));
 }