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/filterindiabox.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gm/filterindiabox.cpp') diff --git a/gm/filterindiabox.cpp b/gm/filterindiabox.cpp index 04e2087bf3..35ccf6e62d 100644 --- a/gm/filterindiabox.cpp +++ b/gm/filterindiabox.cpp @@ -70,22 +70,22 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } #ifdef SK_CPU_ARM64 // Skip tiled drawing on 64-bit ARM until https://skbug.com/2908 is fixed. - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } #endif - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1024, 768); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->translate(10, 10); for (size_t i = 0; i < SK_ARRAY_COUNT(fMatrix); ++i) { SkSize size = computeSize(fBM, fMatrix[i]); -- cgit v1.2.3