diff options
author | mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /gm/polygons.cpp | |
parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (diff) |
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'gm/polygons.cpp')
-rw-r--r-- | gm/polygons.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/polygons.cpp b/gm/polygons.cpp index 1751eadfe9..a5756bbcc7 100644 --- a/gm/polygons.cpp +++ b/gm/polygons.cpp @@ -23,18 +23,18 @@ public: protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("polygons"); } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { int width = kNumPolygons * kCellSize + 40; int height = (kNumJoins * kNumStrokeWidths + kNumExtraStyles) * kCellSize + 40; return SkISize::Make(width, height); } // Construct all polygons - void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() override { SkPoint p0[] = {{0, 0}, {60, 0}, {90, 40}}; // triangle SkPoint p1[] = {{0, 0}, {0, 40}, {60, 40}, {40, 0}}; // trapezoid SkPoint p2[] = {{0, 0}, {40, 40}, {80, 40}, {40, 0}}; // diamond @@ -94,7 +94,7 @@ protected: } } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { // Stroke widths are: // 0(may use hairline rendering), 10(common case for stroke-style) // 40(>= geometry width/height, make the contour filled in fact) |