diff options
author | 2015-03-25 18:17:31 -0700 | |
---|---|---|
committer | 2015-03-25 18:17:32 -0700 | |
commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /gm/typeface.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/typeface.cpp')
-rw-r--r-- | gm/typeface.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gm/typeface.cpp b/gm/typeface.cpp index 1606cef3cb..4114d2cc33 100644 --- a/gm/typeface.cpp +++ b/gm/typeface.cpp @@ -36,15 +36,15 @@ public: } protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("typeface"); } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(640, 480); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { SkString text("Typefaces are fun!"); SkScalar y = 0; @@ -171,7 +171,7 @@ public: } protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { SkString name("typefacestyles"); if (fApplyKerning) { name.append("_kerning"); @@ -179,11 +179,11 @@ protected: return name; } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(640, 480); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { SkPaint paint; paint.setAntiAlias(true); paint.setTextSize(SkIntToScalar(30)); |