Index: gm/degeneratesegments.cpp |
diff --git a/gm/degeneratesegments.cpp b/gm/degeneratesegments.cpp |
index d5164908b64d6e7d5d2d9f22a71b7428bebbc82c..c7254f2e93366165646b8c8b1ac65a49510803c9 100644 |
--- a/gm/degeneratesegments.cpp |
+++ b/gm/degeneratesegments.cpp |
@@ -208,7 +208,7 @@ protected: |
} |
virtual void onDraw(SkCanvas* canvas) { |
- static const AddSegmentFunc gSegmentFunctions[] = { |
+ constexpr AddSegmentFunc gSegmentFunctions[] = { |
AddMove, |
AddMoveClose, |
AddDegenLine, |
@@ -231,7 +231,7 @@ protected: |
AddMoveCubic, |
AddMoveCubicClose |
}; |
- static const char* gSegmentNames[] = { |
+ const char* gSegmentNames[] = { |
"Move", |
"MoveClose", |
"DegenLine", |
@@ -259,7 +259,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"}, |
@@ -269,7 +269,7 @@ protected: |
SkPaint::Style fStyle; |
const char* fName; |
}; |
- static const StyleAndName gStyles[] = { |
+ constexpr StyleAndName gStyles[] = { |
{SkPaint::kFill_Style, "Fill"}, |
{SkPaint::kStroke_Style, "Stroke 10"}, |
{SkPaint::kStrokeAndFill_Style, "Stroke 10 And Fill"} |
@@ -279,7 +279,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"} |