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/HairlinePathBench.cpp b/bench/HairlinePathBench.cpp
index f52fc3b..5b77ff8 100644
--- a/bench/HairlinePathBench.cpp
+++ b/bench/HairlinePathBench.cpp
@@ -42,7 +42,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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;