| Index: gm/pictureshadertile.cpp | 
| diff --git a/gm/pictureshadertile.cpp b/gm/pictureshadertile.cpp | 
| index 877431854c1106055125352463afdfdb1a5d9697..10d5e5db37974dd9b435dd0e3ceeb738708170ef 100644 | 
| --- a/gm/pictureshadertile.cpp | 
| +++ b/gm/pictureshadertile.cpp | 
| @@ -12,11 +12,11 @@ | 
| #include "SkPictureRecorder.h" | 
| #include "SkShader.h" | 
|  | 
| -static const SkScalar kPictureSize = SK_Scalar1; | 
| -static const SkScalar kFillSize = 100; | 
| -static const unsigned kRowSize = 6; | 
| +constexpr SkScalar kPictureSize = SK_Scalar1; | 
| +constexpr SkScalar kFillSize = 100; | 
| +constexpr unsigned kRowSize = 6; | 
|  | 
| -static const struct { | 
| +constexpr struct { | 
| SkScalar x, y, w, h; | 
| SkScalar offsetX, offsetY; | 
| } tiles[] = { | 
|  |