| Index: bench/PatchBench.cpp
|
| diff --git a/bench/PatchBench.cpp b/bench/PatchBench.cpp
|
| index cc9cb84438efa84c81769cb5b48abb14f220196e..097e68ec8ca021ade7cecc67be26bfd48ab9e68c 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},
|
|
|