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/MemsetBench.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bench/MemsetBench.cpp') diff --git a/bench/MemsetBench.cpp b/bench/MemsetBench.cpp index 3e0e8cd6db..41b802c36d 100644 --- a/bench/MemsetBench.cpp +++ b/bench/MemsetBench.cpp @@ -35,18 +35,18 @@ public: fName.printf("memset%d_%d_%d", type, minSize, maxSize); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } virtual void performTest() = 0; protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { for (int i = 0; i < loops; ++i) { this->performTest(); } @@ -63,7 +63,7 @@ public: : INHERITED(MEMSET32, minSize, maxSize) {} protected: - virtual void performTest() SK_OVERRIDE { + void performTest() SK_OVERRIDE { for(int j = fMinSize; j < fMaxSize; ++j){ sk_memset32(kBuffer, VALUE32, j); sk_memset32(kBuffer + 1, VALUE32, j); @@ -82,7 +82,7 @@ public: : INHERITED(MEMSET16, minSize, maxSize) {} protected: - virtual void performTest() SK_OVERRIDE { + void performTest() SK_OVERRIDE { for(int j = fMinSize; j < fMaxSize; ++j){ sk_memset16(kBuffer, VALUE16, j); sk_memset16(kBuffer + 1, VALUE16, j); -- cgit v1.2.3