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/DashBench.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/DashBench.cpp')
-rw-r--r-- | bench/DashBench.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/bench/DashBench.cpp b/bench/DashBench.cpp index 5f209698de..17a9234926 100644 --- a/bench/DashBench.cpp +++ b/bench/DashBench.cpp @@ -57,11 +57,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; this->setupPaint(&paint); paint.setStyle(SkPaint::kStroke_Style); @@ -106,7 +106,7 @@ public: protected: virtual void handlePath(SkCanvas* canvas, const SkPath& path, - const SkPaint& paint, int N) SK_OVERRIDE { + const SkPaint& paint, int N) override { SkPoint pts[2]; if (!path.isLine(pts) || pts[0].fY != pts[1].fY) { this->INHERITED::handlePath(canvas, path, paint, N); @@ -190,11 +190,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { SkPath dst; for (int i = 0; i < loops; ++i) { SkStrokeRec rec(SkStrokeRec::kHairline_InitStyle); @@ -228,11 +228,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; this->setupPaint(&paint); paint.setStrokeWidth(fStrokeWidth); @@ -267,11 +267,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint p; this->setupPaint(&p); p.setColor(SK_ColorBLACK); @@ -353,11 +353,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint p; this->setupPaint(&p); p.setStyle(SkPaint::kStroke_Style); @@ -393,11 +393,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint p; this->setupPaint(&p); p.setColor(SK_ColorBLACK); |