From 36352bf5e38f45a70ee4f4fc132a38048d38206d Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 25 Mar 2015 18:17:31 -0700 Subject: 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 --- gm/variedtext.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gm/variedtext.cpp') 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; -- cgit v1.2.3