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/HairlinePathBench.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'bench/HairlinePathBench.cpp') diff --git a/bench/HairlinePathBench.cpp b/bench/HairlinePathBench.cpp index 37fc57d188..f52fc3b1ff 100644 --- a/bench/HairlinePathBench.cpp +++ b/bench/HairlinePathBench.cpp @@ -42,7 +42,7 @@ public: virtual void makePath(SkPath*) = 0; protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { fName.printf("path_hairline_%s_%s_", fFlags & kBig_Flag ? "big" : "small", fFlags & kAA_Flag ? "AA" : "noAA"); @@ -50,7 +50,7 @@ protected: return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint(fPaint); this->setupPaint(&paint); @@ -80,10 +80,10 @@ class LinePathBench : public HairlinePathBench { public: LinePathBench(Flags flags) : INHERITED(flags) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("line"); } - virtual void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) SK_OVERRIDE { SkRandom rand; int size = SK_ARRAY_COUNT(points); int hSize = size / 2; @@ -112,10 +112,10 @@ class QuadPathBench : public HairlinePathBench { public: QuadPathBench(Flags flags) : INHERITED(flags) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("quad"); } - virtual void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) SK_OVERRIDE { SkRandom rand; int size = SK_ARRAY_COUNT(points); int hSize = size / 2; @@ -144,10 +144,10 @@ class ConicPathBench : public HairlinePathBench { public: ConicPathBench(Flags flags) : INHERITED(flags) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("conic"); } - virtual void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) SK_OVERRIDE { SkRandom rand; SkRandom randWeight; int size = SK_ARRAY_COUNT(points); @@ -180,10 +180,10 @@ class CubicPathBench : public HairlinePathBench { public: CubicPathBench(Flags flags) : INHERITED(flags) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("cubic"); } - virtual void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) SK_OVERRIDE { SkRandom rand; int size = SK_ARRAY_COUNT(points); int hSize = size / 2; -- cgit v1.2.3