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/variedtext.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/variedtext.cpp')
-rw-r--r-- | gm/variedtext.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/variedtext.cpp b/gm/variedtext.cpp index bbdbc8a6d2..989bebd328 100644 --- a/gm/variedtext.cpp +++ b/gm/variedtext.cpp @@ -31,7 +31,7 @@ public: } protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { SkString name("varied_text"); if (fEffectiveClip) { name.append("_clipped"); @@ -46,11 +46,11 @@ protected: return name; } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(640, 480); } - void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() override { fPaint.setAntiAlias(true); fPaint.setLCDRenderText(fLCD); @@ -111,7 +111,7 @@ protected: } } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { for (int i = 0; i < kCnt; ++i) { fPaint.setColor(fColors[i]); fPaint.setTextSize(fPtSizes[i]); @@ -136,7 +136,7 @@ protected: } } - bool runAsBench() const SK_OVERRIDE { return true; } + bool runAsBench() const override { return true; } private: static const int kCnt = 30; |