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/BlurRectBench.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bench/BlurRectBench.cpp') diff --git a/bench/BlurRectBench.cpp b/bench/BlurRectBench.cpp index cdcdfe57f3..66aff22073 100644 --- a/bench/BlurRectBench.cpp +++ b/bench/BlurRectBench.cpp @@ -88,7 +88,7 @@ class BlurRectDirectBench: public BlurRectBench { this->setName(name); } protected: - virtual void makeBlurryRect(const SkRect& r) SK_OVERRIDE { + void makeBlurryRect(const SkRect& r) SK_OVERRIDE { SkMask mask; SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(this->radius()), &mask, r, kNormal_SkBlurStyle); @@ -110,7 +110,7 @@ public: } protected: - virtual void preBenchSetup(const SkRect& r) SK_OVERRIDE { + void preBenchSetup(const SkRect& r) SK_OVERRIDE { SkMask::FreeImage(fSrcMask.fImage); r.roundOut(&fSrcMask.fBounds); @@ -142,7 +142,7 @@ public: protected: - virtual void makeBlurryRect(const SkRect&) SK_OVERRIDE { + void makeBlurryRect(const SkRect&) SK_OVERRIDE { SkMask mask; mask.fImage = NULL; SkBlurMask::BoxBlur(&mask, fSrcMask, SkBlurMask::ConvertRadiusToSigma(this->radius()), @@ -169,7 +169,7 @@ public: protected: - virtual void makeBlurryRect(const SkRect&) SK_OVERRIDE { + void makeBlurryRect(const SkRect&) SK_OVERRIDE { SkMask mask; mask.fImage = NULL; SkBlurMask::BlurGroundTruth(SkBlurMask::ConvertRadiusToSigma(this->radius()), -- cgit v1.2.3