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/gradients.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gm/gradients.cpp') diff --git a/gm/gradients.cpp b/gm/gradients.cpp index 43f8c94e92..9b416fa89f 100644 --- a/gm/gradients.cpp +++ b/gm/gradients.cpp @@ -329,12 +329,12 @@ public: protected: - SkString onShortName() SK_OVERRIDE { return SkString("radial_gradient"); } - SkISize onISize() SK_OVERRIDE { return SkISize::Make(1280, 1280); } + SkString onShortName() override { return SkString("radial_gradient"); } + SkISize onISize() override { return SkISize::Make(1280, 1280); } void drawBG(SkCanvas* canvas) { canvas->drawColor(0xFF000000); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { const SkISize dim = this->getISize(); this->drawBG(canvas); @@ -369,14 +369,14 @@ public: protected: - SkString onShortName() SK_OVERRIDE { return SkString("radial_gradient2"); } - SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 400); } + SkString onShortName() override { return SkString("radial_gradient2"); } + SkISize onISize() override { return SkISize::Make(800, 400); } void drawBG(SkCanvas* canvas) { canvas->drawColor(0xFF000000); } // Reproduces the example given in bug 7671058. - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { SkPaint paint1, paint2, paint3; paint1.setStyle(SkPaint::kFill_Style); paint2.setStyle(SkPaint::kFill_Style); -- cgit v1.2.3