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/fontmgr.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/fontmgr.cpp')
-rw-r--r-- | gm/fontmgr.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index e89e585fde..5ef5c6d516 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -68,15 +68,15 @@ public: } protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return fName; } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(1536, 768); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { SkScalar y = 20; SkPaint paint; paint.setAntiAlias(true); @@ -130,11 +130,11 @@ public: } protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("fontmgr_match"); } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(640, 1024); } @@ -176,7 +176,7 @@ protected: } } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { SkPaint paint; paint.setAntiAlias(true); paint.setLCDRenderText(true); @@ -237,15 +237,15 @@ public: } protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return fName; } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(1024, 850); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { SkPaint paint; paint.setAntiAlias(true); paint.setSubpixelText(true); |