diff options
| author |  mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
| commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
| tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /bench/HairlinePathBench.cpp | |
| parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (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/HairlinePathBench.cpp')
| -rw-r--r-- | bench/HairlinePathBench.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/bench/HairlinePathBench.cpp b/bench/HairlinePathBench.cpp index f52fc3b1ff..5b77ff8b49 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; |