Index: gm/quadpaths.cpp |
diff --git a/gm/quadpaths.cpp b/gm/quadpaths.cpp |
index 359f62dd39467a5a9d16c7d2b3958704c11fb812..0578d2ea96567a4b4b800e602d88f81ba85730f6 100644 |
--- a/gm/quadpaths.cpp |
+++ b/gm/quadpaths.cpp |
@@ -47,7 +47,7 @@ protected: |
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"}, |
@@ -57,7 +57,7 @@ protected: |
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"}, |
@@ -67,7 +67,7 @@ protected: |
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"} |
@@ -190,7 +190,7 @@ protected: |
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"}, |
@@ -200,7 +200,7 @@ protected: |
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"}, |
@@ -210,7 +210,7 @@ protected: |
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"} |