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/MergeBench.cpp b/bench/MergeBench.cpp
index 1e8069e..05d6822 100644
--- a/bench/MergeBench.cpp
+++ b/bench/MergeBench.cpp
@@ -20,11 +20,11 @@
MergeBench(bool small) : fIsSmall(small), fInitialized(false) { }
protected:
- const char* onGetName() SK_OVERRIDE {
+ const char* onGetName() override {
return fIsSmall ? "merge_small" : "merge_large";
}
- void onPreDraw() SK_OVERRIDE {
+ void onPreDraw() override {
if (!fInitialized) {
make_bitmap();
make_checkerboard();
@@ -32,7 +32,7 @@
}
}
- void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(const int loops, SkCanvas* canvas) override {
SkRect r = fIsSmall ? SkRect::MakeWH(FILTER_WIDTH_SMALL, FILTER_HEIGHT_SMALL) :
SkRect::MakeWH(FILTER_WIDTH_LARGE, FILTER_HEIGHT_LARGE);
SkPaint paint;