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/LightingBench.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'bench/LightingBench.cpp') diff --git a/bench/LightingBench.cpp b/bench/LightingBench.cpp index 4d234b951f..ed0c9858ef 100644 --- a/bench/LightingBench.cpp +++ b/bench/LightingBench.cpp @@ -101,11 +101,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "lightingpointlitdiffuse_small" : "lightingpointlitdiffuse_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { draw(loops, canvas, SkLightingImageFilter::CreatePointLitDiffuse(getPointLocation(), getWhite(), getSurfaceScale(), @@ -122,11 +122,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "lightingdistantlitdiffuse_small" : "lightingdistantlitdiffuse_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { draw(loops, canvas, SkLightingImageFilter::CreateDistantLitDiffuse(getDistantDirection(), getWhite(), getSurfaceScale(), @@ -143,11 +143,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "lightingspotlitdiffuse_small" : "lightingspotlitdiffuse_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { draw(loops, canvas, SkLightingImageFilter::CreateSpotLitDiffuse(getSpotLocation(), getSpotTarget(), getSpotExponent(), @@ -167,11 +167,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "lightingpointlitspecular_small" : "lightingpointlitspecular_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { draw(loops, canvas, SkLightingImageFilter::CreatePointLitSpecular(getPointLocation(), getWhite(), getSurfaceScale(), @@ -189,11 +189,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "lightingdistantlitspecular_small" : "lightingdistantlitspecular_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { draw(loops, canvas, SkLightingImageFilter::CreateDistantLitSpecular(getDistantDirection(), getWhite(), getSurfaceScale(), @@ -211,11 +211,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "lightingspotlitspecular_small" : "lightingspotlitspecular_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { draw(loops, canvas, SkLightingImageFilter::CreateSpotLitSpecular(getSpotLocation(), getSpotTarget(), getSpotExponent(), -- cgit v1.2.3