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/SortBench.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bench/SortBench.cpp') diff --git a/bench/SortBench.cpp b/bench/SortBench.cpp index a7e8c2cd0b..b46b805890 100644 --- a/bench/SortBench.cpp +++ b/bench/SortBench.cpp @@ -107,22 +107,22 @@ public: fName.printf("sort_%s_%s", gSorts[s].fName, gRec[t].fName); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } // Delayed initialization only done if onDraw will be called. - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { fUnsorted.reset(N); gRec[fType].fProc(fUnsorted.get()); } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { SkAutoTMalloc sorted(N); for (int i = 0; i < loops; i++) { memcpy(sorted.get(), fUnsorted.get(), N*sizeof(int)); -- cgit v1.2.3