aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench/PatchBench.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-03-25 18:17:31 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-25 18:17:32 -0700
commit36352bf5e38f45a70ee4f4fc132a38048d38206d (patch)
tree24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /bench/PatchBench.cpp
parent02fd592c8d190058652bb715fb34feb7a72992e5 (diff)
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
Diffstat (limited to 'bench/PatchBench.cpp')
-rw-r--r--bench/PatchBench.cpp18
1 files changed, 9 insertions, 9 deletions
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},