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 --- bench/MergeBench.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bench/MergeBench.cpp') diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp index 2e1ca32350..1e8069ee0e 100644 --- a/bench/MergeBench.cpp +++ b/bench/MergeBench.cpp @@ -20,11 +20,11 @@ public: MergeBench(bool small) : fIsSmall(small), fInitialized(false) { } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "merge_small" : "merge_large"; } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { if (!fInitialized) { make_bitmap(); make_checkerboard(); @@ -32,7 +32,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = fIsSmall ? SkRect::MakeWH(FILTER_WIDTH_SMALL, FILTER_HEIGHT_SMALL) : SkRect::MakeWH(FILTER_WIDTH_LARGE, FILTER_HEIGHT_LARGE); SkPaint paint; -- cgit v1.2.3