From 72c9faab45124e08c85f70ca38536914862d947c Mon Sep 17 00:00:00 2001 From: mtklein Date: Fri, 9 Jan 2015 10:06:39 -0800 Subject: Fix up all the easy virtual ... SK_OVERRIDE cases. This fixes every case where virtual and SK_OVERRIDE were on the same line, which should be the bulk of cases. We'll have to manually clean up the rest over time unless I level up in regexes. for f in (find . -type f); perl -p -i -e 's/virtual (.*)SK_OVERRIDE/\1SK_OVERRIDE/g' $f; end BUG=skia: Review URL: https://codereview.chromium.org/806653007 --- 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 2a0f7c0bb5..2f9a69e0f8 100644 --- a/bench/DisplacementBench.cpp +++ b/bench/DisplacementBench.cpp @@ -22,7 +22,7 @@ public: } protected: - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { if (!fInitialized) { this->makeBitmap(); this->makeCheckerboard(); @@ -91,11 +91,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return this->isSmall() ? "displacement_zero_small" : "displacement_zero_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkAutoTUnref displ(SkBitmapSource::Create(fCheckerboard)); // No displacement effect @@ -118,11 +118,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return isSmall() ? "displacement_alpha_small" : "displacement_alpha_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkAutoTUnref displ(SkBitmapSource::Create(fCheckerboard)); // Displacement, with 1 alpha component (which isn't pre-multiplied) @@ -144,11 +144,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return isSmall() ? "displacement_full_small" : "displacement_full_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkAutoTUnref displ(SkBitmapSource::Create(fCheckerboard)); // Displacement, with 2 non-alpha components -- cgit v1.2.3