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/ovals.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gm/ovals.cpp') diff --git a/gm/ovals.cpp b/gm/ovals.cpp index 4afabc284d..a4232aab37 100755 --- a/gm/ovals.cpp +++ b/gm/ovals.cpp @@ -26,15 +26,15 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("ovals"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1200, 900); } @@ -138,7 +138,7 @@ protected: return SkHSVToColor(hsv); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkRandom rand(1); canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1); SkRect oval = SkRect::MakeLTRB(-20, -30, 20, 30); -- cgit v1.2.3