Index: gm/linepaths.cpp |
diff --git a/gm/linepaths.cpp b/gm/linepaths.cpp |
index 51df788dd42861a76ff2470a7962668668288630..e7a0c9396c9c88c7301db91ac69bdfd2d05d3a9c 100644 |
--- a/gm/linepaths.cpp |
+++ b/gm/linepaths.cpp |
@@ -33,7 +33,7 @@ static void draw(SkCanvas* canvas, bool doClose) { |
SkPath::FillType fFill; |
const char* fName; |
}; |
- static const FillAndName gFills[] = { |
+ constexpr FillAndName gFills[] = { |
{SkPath::kWinding_FillType, "Winding"}, |
{SkPath::kEvenOdd_FillType, "Even / Odd"}, |
{SkPath::kInverseWinding_FillType, "Inverse Winding"}, |
@@ -43,7 +43,7 @@ static void draw(SkCanvas* canvas, bool doClose) { |
SkPaint::Style fStyle; |
const char* fName; |
}; |
- static const StyleAndName gStyles[] = { |
+ constexpr StyleAndName gStyles[] = { |
{SkPaint::kFill_Style, "Fill"}, |
{SkPaint::kStroke_Style, "Stroke"}, |
{SkPaint::kStrokeAndFill_Style, "Stroke And Fill"}, |
@@ -53,7 +53,7 @@ static void draw(SkCanvas* canvas, bool doClose) { |
SkPaint::Join fJoin; |
const char* fName; |
}; |
- static const CapAndName gCaps[] = { |
+ constexpr CapAndName gCaps[] = { |
{SkPaint::kButt_Cap, SkPaint::kBevel_Join, "Butt"}, |
{SkPaint::kRound_Cap, SkPaint::kRound_Join, "Round"}, |
{SkPaint::kSquare_Cap, SkPaint::kBevel_Join, "Square"} |