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
diff --git a/bench/DashBench.cpp b/bench/DashBench.cpp
index 5f20969..17a9234 100644
--- a/bench/DashBench.cpp
+++ b/bench/DashBench.cpp
@@ -57,11 +57,11 @@
}
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 @@
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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);