| Index: bench/HairlinePathBench.cpp
|
| diff --git a/bench/HairlinePathBench.cpp b/bench/HairlinePathBench.cpp
|
| index f52fc3b1ff42389f1c846c50b6e3a1c8e062b661..5b77ff8b49cb32eb891ec597b8e423fbefbd93c4 100644
|
| --- a/bench/HairlinePathBench.cpp
|
| +++ b/bench/HairlinePathBench.cpp
|
| @@ -42,7 +42,7 @@ public:
|
| virtual void makePath(SkPath*) = 0;
|
|
|
| protected:
|
| - const char* onGetName() SK_OVERRIDE {
|
| + const char* onGetName() 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();
|
| }
|
|
|
| - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
|
| + void onDraw(const int loops, SkCanvas* canvas) override {
|
| SkPaint paint(fPaint);
|
| this->setupPaint(&paint);
|
|
|
| @@ -80,10 +80,10 @@ class LinePathBench : public HairlinePathBench {
|
| public:
|
| LinePathBench(Flags flags) : INHERITED(flags) {}
|
|
|
| - void appendName(SkString* name) SK_OVERRIDE {
|
| + void appendName(SkString* name) override {
|
| name->append("line");
|
| }
|
| - void makePath(SkPath* path) SK_OVERRIDE {
|
| + void makePath(SkPath* path) 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) {}
|
|
|
| - void appendName(SkString* name) SK_OVERRIDE {
|
| + void appendName(SkString* name) override {
|
| name->append("quad");
|
| }
|
| - void makePath(SkPath* path) SK_OVERRIDE {
|
| + void makePath(SkPath* path) 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) {}
|
|
|
| - void appendName(SkString* name) SK_OVERRIDE {
|
| + void appendName(SkString* name) override {
|
| name->append("conic");
|
| }
|
| - void makePath(SkPath* path) SK_OVERRIDE {
|
| + void makePath(SkPath* path) 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) {}
|
|
|
| - void appendName(SkString* name) SK_OVERRIDE {
|
| + void appendName(SkString* name) override {
|
| name->append("cubic");
|
| }
|
| - void makePath(SkPath* path) SK_OVERRIDE {
|
| + void makePath(SkPath* path) override {
|
| SkRandom rand;
|
| int size = SK_ARRAY_COUNT(points);
|
| int hSize = size / 2;
|
|
|