From 36352bf5e38f45a70ee4f4fc132a38048d38206d Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 25 Mar 2015 18:17:31 -0700 Subject: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002 --- bench/PatchBench.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'bench/PatchBench.cpp') diff --git a/bench/PatchBench.cpp b/bench/PatchBench.cpp index cc9cb84438..097e68ec8c 100644 --- a/bench/PatchBench.cpp +++ b/bench/PatchBench.cpp @@ -82,7 +82,7 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { SkString vertexMode; switch (fVertexMode) { case kNone_VertexMode: @@ -107,7 +107,7 @@ protected: return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { this->setCubics(); this->setColors(); this->setTexCoords(); @@ -123,7 +123,7 @@ protected: } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) 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) { } - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("square"); } - void setCubics() SK_OVERRIDE { + void setCubics() 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) { } - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("LOD_Diff"); } - void setCubics() SK_OVERRIDE { + void setCubics() 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) { } - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("loop"); } - void setCubics() SK_OVERRIDE { + void setCubics() override { const SkPoint points[SkPatchUtils::kNumCtrlPts] = { //top points {100,100},{300,200},{100,200}, {300,100}, -- cgit v1.2.3