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 --- gm/gradients.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gm/gradients.cpp') diff --git a/gm/gradients.cpp b/gm/gradients.cpp index 481b476e37..98093ab800 100644 --- a/gm/gradients.cpp +++ b/gm/gradients.cpp @@ -105,7 +105,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -162,7 +162,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -334,16 +334,16 @@ public: RadialGradientGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } SkString onShortName() SK_OVERRIDE { return SkString("radial_gradient"); } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(1280, 1280); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1280, 1280); } void drawBG(SkCanvas* canvas) { canvas->drawColor(0xFF000000); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { const SkISize dim = this->getISize(); this->drawBG(canvas); @@ -377,18 +377,18 @@ public: RadialGradient2GM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } SkString onShortName() SK_OVERRIDE { return SkString("radial_gradient2"); } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 400); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 400); } void drawBG(SkCanvas* canvas) { canvas->drawColor(0xFF000000); } // Reproduces the example given in bug 7671058. - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint1, paint2, paint3; paint1.setStyle(SkPaint::kFill_Style); paint2.setStyle(SkPaint::kFill_Style); -- cgit v1.2.3