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/lighting.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gm/lighting.cpp') diff --git a/gm/lighting.cpp b/gm/lighting.cpp index e56d9fc0c7..4952256068 100644 --- a/gm/lighting.cpp +++ b/gm/lighting.cpp @@ -20,11 +20,11 @@ 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("lighting"); } @@ -41,7 +41,7 @@ protected: canvas.drawText(str, strlen(str), SkIntToScalar(20), SkIntToScalar(70), paint); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(WIDTH, HEIGHT); } @@ -54,7 +54,7 @@ protected: canvas->restore(); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { if (!fInitialized) { make_bitmap(); fInitialized = true; -- cgit v1.2.3