Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(700)

Unified Diff: gm/cubicpaths.cpp

Issue 2300623005: Replace a lot of 'static const' with 'constexpr' or 'const'. (Closed)
Patch Set: small msvc concession Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gm/convexpolyeffect.cpp ('k') | gm/dashcircle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"}
« no previous file with comments | « gm/convexpolyeffect.cpp ('k') | gm/dashcircle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698