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/verttext.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/verttext.cpp')
-rw-r--r-- | gm/verttext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/verttext.cpp b/gm/verttext.cpp index ba355a589e..9039685206 100644 --- a/gm/verttext.cpp +++ b/gm/verttext.cpp @@ -50,11 +50,11 @@ public: protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("verttext"); } - SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } + SkISize onISize() override { return SkISize::Make(640, 480); } static void drawBaseline(SkCanvas* canvas, const SkPaint& paint, SkScalar x, SkScalar y) { @@ -82,7 +82,7 @@ protected: canvas->drawCircle(x, y, SK_Scalar1 * 3 / 2, p); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { SkScalar x = SkIntToScalar(100); SkScalar y = SkIntToScalar(50); |