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/quadpaths.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/quadpaths.cpp')
| -rw-r--r-- | gm/quadpaths.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gm/quadpaths.cpp b/gm/quadpaths.cpp index d9448b6baf..d5eb646313 100644 --- a/gm/quadpaths.cpp +++ b/gm/quadpaths.cpp @@ -17,11 +17,11 @@ public: protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("quadpath"); } - SkISize onISize() SK_OVERRIDE { return SkISize::Make(1240, 390); } + SkISize onISize() override { return SkISize::Make(1240, 390); } void drawPath(SkPath& path,SkCanvas* canvas,SkColor color, const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join, @@ -40,7 +40,7 @@ protected: canvas->restore(); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { struct FillAndName { SkPath::FillType fFill; const char* fName; @@ -162,11 +162,11 @@ public: protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("quadclosepath"); } - SkISize onISize() SK_OVERRIDE { return SkISize::Make(1240, 390); } + SkISize onISize() override { return SkISize::Make(1240, 390); } void drawPath(SkPath& path,SkCanvas* canvas,SkColor color, const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join, @@ -185,7 +185,7 @@ protected: canvas->restore(); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { struct FillAndName { SkPath::FillType fFill; const char* fName; |