diff options
author | mtklein <mtklein@chromium.org> | 2015-01-09 10:06:39 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-09 10:06:40 -0800 |
commit | 72c9faab45124e08c85f70ca38536914862d947c (patch) | |
tree | 611893b84bb33b1592d058ee0f2382f7f86601b8 /bench/PatchBench.cpp | |
parent | 4490da227f1475fb66af20532c14d6d9febd18b6 (diff) |
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
Diffstat (limited to 'bench/PatchBench.cpp')
-rw-r--r-- | bench/PatchBench.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bench/PatchBench.cpp b/bench/PatchBench.cpp index 744141a879..cc9cb84438 100644 --- a/bench/PatchBench.cpp +++ b/bench/PatchBench.cpp @@ -82,7 +82,7 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { SkString vertexMode; switch (fVertexMode) { case kNone_VertexMode: @@ -107,7 +107,7 @@ protected: return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { this->setCubics(); this->setColors(); this->setTexCoords(); @@ -123,7 +123,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { canvas->scale(fScale.x(), fScale.y()); for (int i = 0; i < loops; i++) { switch (fVertexMode) { @@ -161,11 +161,11 @@ public: SquarePatchBench(SkPoint scale, VertexMode vertexMode) : INHERITED(scale, vertexMode) { } - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("square"); } - virtual void setCubics() SK_OVERRIDE { + void setCubics() SK_OVERRIDE { const SkPoint points[SkPatchUtils::kNumCtrlPts] = { //top points {100,100},{150,100},{250,100}, {300,100}, @@ -187,11 +187,11 @@ public: LODDiffPatchBench(SkPoint scale, VertexMode vertexMode) : INHERITED(scale, vertexMode) { } - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("LOD_Diff"); } - virtual void setCubics() SK_OVERRIDE { + void setCubics() SK_OVERRIDE { const SkPoint points[SkPatchUtils::kNumCtrlPts] = { //top points {100,175},{150,100},{250,100}, {300,0}, @@ -213,11 +213,11 @@ public: LoopPatchBench(SkPoint scale, VertexMode vertexMode) : INHERITED(scale, vertexMode) { } - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("loop"); } - virtual void setCubics() SK_OVERRIDE { + void setCubics() SK_OVERRIDE { const SkPoint points[SkPatchUtils::kNumCtrlPts] = { //top points {100,100},{300,200},{100,200}, {300,100}, |