| Index: gm/cubicpaths.cpp
|
| diff --git a/gm/cubicpaths.cpp b/gm/cubicpaths.cpp
|
| index 819dac25dc24115fa95f7316f5f4dc931f12c9ac..abac5b21776bcebf952a3f41d79161263e5933fd 100644
|
| --- a/gm/cubicpaths.cpp
|
| +++ b/gm/cubicpaths.cpp
|
| @@ -158,7 +158,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"},
|
| @@ -168,7 +168,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"},
|
| @@ -178,7 +178,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"}
|
| @@ -302,7 +302,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"},
|
| @@ -312,7 +312,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"},
|
| @@ -322,7 +322,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"}
|
|
|