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/pictureshader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gm/pictureshader.cpp') diff --git a/gm/pictureshader.cpp b/gm/pictureshader.cpp index 152cdf37a4..c622ee3fae 100644 --- a/gm/pictureshader.cpp +++ b/gm/pictureshader.cpp @@ -42,19 +42,19 @@ 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("pictureshader"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1400, 1250); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { this->drawSceneColumn(canvas, SkPoint::Make(0, 0), 1, 1, 0); this->drawSceneColumn(canvas, SkPoint::Make(0, fSceneSize * 6.4f), 1, 2, 0); this->drawSceneColumn(canvas, SkPoint::Make(fSceneSize * 2.4f, 0), 1, 1, 1); -- cgit v1.2.3