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/ImageFilterCollapse.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bench/ImageFilterCollapse.cpp') diff --git a/bench/ImageFilterCollapse.cpp b/bench/ImageFilterCollapse.cpp index 4e56c72f57..c631c99262 100644 --- a/bench/ImageFilterCollapse.cpp +++ b/bench/ImageFilterCollapse.cpp @@ -39,7 +39,7 @@ protected: } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { makeBitmap(); for(int i = 0; i < loops; i++) { @@ -79,11 +79,11 @@ public: virtual ~TableCollapseBench() {} protected: - virtual const char* onGetName() SK_OVERRIDE { + virtual const char* onGetName() override { return "image_filter_collapse_table"; } - virtual void onPreDraw() SK_OVERRIDE { + virtual void onPreDraw() override { for (int i = 0; i < 256; ++i) { int n = i >> 5; table1[i] = (n << 5) | (n << 2) | (n >> 1); @@ -135,11 +135,11 @@ public: virtual ~MatrixCollapseBench() {} protected: - virtual const char* onGetName() SK_OVERRIDE { + virtual const char* onGetName() override { return "image_filter_collapse_matrix"; } - virtual void onPreDraw() SK_OVERRIDE { + virtual void onPreDraw() override { SkColorFilter* colorFilters[] = { make_brightness(0.1f), make_grayscale(), -- cgit v1.2.3