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 --- bench/DisplacementBench.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'bench/DisplacementBench.cpp') diff --git a/bench/DisplacementBench.cpp b/bench/DisplacementBench.cpp index 2f9a69e0f8..b9070cb9e0 100644 --- a/bench/DisplacementBench.cpp +++ b/bench/DisplacementBench.cpp @@ -22,7 +22,7 @@ public: } protected: - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { if (!fInitialized) { this->makeBitmap(); this->makeCheckerboard(); @@ -91,11 +91,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return this->isSmall() ? "displacement_zero_small" : "displacement_zero_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; SkAutoTUnref displ(SkBitmapSource::Create(fCheckerboard)); // No displacement effect @@ -118,11 +118,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "displacement_alpha_small" : "displacement_alpha_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; SkAutoTUnref displ(SkBitmapSource::Create(fCheckerboard)); // Displacement, with 1 alpha component (which isn't pre-multiplied) @@ -144,11 +144,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "displacement_full_small" : "displacement_full_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; SkAutoTUnref displ(SkBitmapSource::Create(fCheckerboard)); // Displacement, with 2 non-alpha components -- cgit v1.2.3