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

gm/pathfill.cpp

 /*
  * Copyright 2011 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 "SkPath.h"
 
 typedef SkScalar (*MakePathProc)(SkPath*);
 
 static SkScalar make_frame(SkPath* path) {
     SkRect r = { SkIntToScalar(10), SkIntToScalar(10),
                  SkIntToScalar(630), SkIntToScalar(470) };
     path->addRoundRect(r, SkIntToScalar(15), SkIntToScalar(15));
 
     SkPaint paint;
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setStrokeWidth(SkIntToScalar(5));
     paint.getFillPath(*path, path);
     return SkIntToScalar(15);
 }
 
 static SkScalar make_triangle(SkPath* path) {
-    static const int gCoord[] = {
+    constexpr int gCoord[] = {
         10, 20, 15, 5, 30, 30
     };
     path->moveTo(SkIntToScalar(gCoord[0]), SkIntToScalar(gCoord[1]));
     path->lineTo(SkIntToScalar(gCoord[2]), SkIntToScalar(gCoord[3]));
     path->lineTo(SkIntToScalar(gCoord[4]), SkIntToScalar(gCoord[5]));
     path->close();
     path->offset(SkIntToScalar(10), SkIntToScalar(0));
     return SkIntToScalar(30);
 }
 
@@ skipping 58 matching lines @@
     path->moveTo(SkIntToScalar(30), SkIntToScalar(30));
     path->lineTo(SkIntToScalar(120), SkIntToScalar(40));
     path->close();
     path->moveTo(SkIntToScalar(150), SkIntToScalar(30));
     path->lineTo(SkIntToScalar(150), SkIntToScalar(30));
     path->lineTo(SkIntToScalar(300), SkIntToScalar(40));
     path->close();
     return SkIntToScalar(40);
 }
 
-static const MakePathProc gProcs[] = {
+constexpr MakePathProc gProcs[] = {
     make_frame,
     make_triangle,
     make_rect,
     make_oval,
     make_sawtooth,
     make_star_5,
     make_star_13,
     make_line,
 };
 
@@ skipping 116 matching lines @@
     // Rotated path, which is not antialiased on GPU
     p.setColor(SK_ColorRED);
     canvas->rotate(90);
     canvas->drawPath(path, p);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new PathFillGM; )
 DEF_GM( return new PathInverseFillGM; )