C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}

bench/GeometryBench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "SkGeometry.h"
 #include "SkRandom.h"
 #include "SkRect.h"
 
 class GeometryBench : public Benchmark {
 public:
     GeometryBench(const char suffix[]) : fVolatileInt(0) {
         fName.printf("geo_%s", suffix);
     }
 
-    const char* onGetName() SK_OVERRIDE {
+    const char* onGetName() override {
         return fName.c_str();
     }
 
-    bool isSuitableFor(Backend backend) SK_OVERRIDE {
+    bool isSuitableFor(Backend backend) override {
         return kNonRendering_Backend == backend;
     }
 
 protected:
     volatile int fVolatileInt;
 
     /**
      *  Subclasses can call this to try to defeat the optimizer (with some result of their
      *  inner loop), since it will fool the compiler into assuming that "n" is actually
      *  needed somewhere, and since this method is not const, the member fields cannot
@@ skipping 24 matching lines @@
             fRects[i].setXYWH(x, y, w, h);
         }
     }
 };
 
 class GeoRectBench_intersect : public GeoRectBench {
 public:
     GeoRectBench_intersect() : GeoRectBench("rect_intersect") {}
 
 protected:
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         for (int outer = 0; outer < loops; ++outer) {
             int count = 0;
             for (size_t i = 0; i < SK_ARRAY_COUNT(fRects); ++i) {
                 SkRect r = fRects[0];
                 count += r.intersect(fRects[i]);
             }
             this->virtualCallToFoilOptimizers(count);
         }
     }
 };
 
 class GeoRectBench_intersect_rect : public GeoRectBench {
 public:
     GeoRectBench_intersect_rect() : GeoRectBench("rect_intersect_rect") {}
 
 protected:
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         for (int outer = 0; outer < loops; ++outer) {
             int count = 0;
             SkRect r;
             for (size_t i = 0; i < SK_ARRAY_COUNT(fRects); ++i) {
                 count += r.intersect(fRects[0], fRects[i]);
             }
             this->virtualCallToFoilOptimizers(count);
         }
     }
 };
 
 class GeoRectBench_Intersects : public GeoRectBench {
 public:
     GeoRectBench_Intersects() : GeoRectBench("rect_Intersects") {}
     
 protected:
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         for (int outer = 0; outer < loops; ++outer) {
             int count = 0;
             for (size_t i = 0; i < SK_ARRAY_COUNT(fRects); ++i) {
                 count += SkRect::Intersects(fRects[0], fRects[i]);
             }
             this->virtualCallToFoilOptimizers(count);
         }
     }
 };
 
 class GeoRectBench_sort : public GeoRectBench {
 public:
     GeoRectBench_sort() : GeoRectBench("rect_sort") {}
     
 protected:
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         for (int outer = 0; outer < loops; ++outer) {
             for (size_t i = 0; i < SK_ARRAY_COUNT(fRects); ++i) {
                 fRects[i].sort();
             }
         }
     }
 };
 
 DEF_BENCH( return new GeoRectBench_intersect; )
 DEF_BENCH( return new GeoRectBench_intersect_rect; )
@@ skipping 12 matching lines @@
         for (int i = 0; i < 4; ++i) {
             fPts[i].set(rand.nextUScalar1(), rand.nextUScalar1());
         }
     }
 };
 
 class EvalQuadAt0 : public QuadBenchBase {
 public:
     EvalQuadAt0() : QuadBenchBase("evalquadat0") {}
 protected:
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         SkPoint result;
         for (int outer = 0; outer < loops; ++outer) {
             SkEvalQuadAt(fPts, 0.5f, &result);
             SkEvalQuadAt(fPts, 0.5f, &result);
             SkEvalQuadAt(fPts, 0.5f, &result);
             SkEvalQuadAt(fPts, 0.5f, &result);
         }
     }
 };
 DEF_BENCH( return new EvalQuadAt0; )
 
 class EvalQuadAt1 : public QuadBenchBase {
 public:
     EvalQuadAt1() : QuadBenchBase("evalquadat1") {}
 protected:
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         SkPoint result;
         for (int outer = 0; outer < loops; ++outer) {
             result = SkEvalQuadAt(fPts, 0.5f);
             result = SkEvalQuadAt(fPts, 0.5f);
             result = SkEvalQuadAt(fPts, 0.5f);
             result = SkEvalQuadAt(fPts, 0.5f);
         }
     }
 };
 DEF_BENCH( return new EvalQuadAt1; )
 
 ////////
 
 class EvalQuadTangentAt0 : public QuadBenchBase {
 public:
     EvalQuadTangentAt0() : QuadBenchBase("evalquadtangentat0") {}
 protected:
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         SkPoint result;
         for (int outer = 0; outer < loops; ++outer) {
             SkEvalQuadAt(fPts, 0.5f, NULL, &result);
             SkEvalQuadAt(fPts, 0.5f, NULL, &result);
             SkEvalQuadAt(fPts, 0.5f, NULL, &result);
             SkEvalQuadAt(fPts, 0.5f, NULL, &result);
         }
     }
 };
 DEF_BENCH( return new EvalQuadTangentAt0; )
 
 class EvalQuadTangentAt1 : public QuadBenchBase {
 public:
     EvalQuadTangentAt1() : QuadBenchBase("evalquadtangentat1") {}
 protected:
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         SkPoint result;
         for (int outer = 0; outer < loops; ++outer) {
             result = SkEvalQuadTangentAt(fPts, 0.5f);
             result = SkEvalQuadTangentAt(fPts, 0.5f);
             result = SkEvalQuadTangentAt(fPts, 0.5f);
             result = SkEvalQuadTangentAt(fPts, 0.5f);
         }
     }
 };
 DEF_BENCH( return new EvalQuadTangentAt1; )
 
 ////////
 
 class ChopQuadAt0 : public QuadBenchBase {
 public:
     ChopQuadAt0() : QuadBenchBase("chopquadat0") {}
 protected:
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         SkPoint dst[5];
         for (int outer = 0; outer < loops; ++outer) {
             SkChopQuadAt(fPts, dst, 0.5f);
             SkChopQuadAt(fPts, dst, 0.5f);
             SkChopQuadAt(fPts, dst, 0.5f);
             SkChopQuadAt(fPts, dst, 0.5f);
         }
     }
 };
 DEF_BENCH( return new ChopQuadAt0; )
 
 class ChopQuadAt1 : public QuadBenchBase {
 public:
     ChopQuadAt1() : QuadBenchBase("chopquadat1") {}
 protected:
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         SkPoint dst[5];
         for (int outer = 0; outer < loops; ++outer) {
             SkChopQuadAt2(fPts, dst, 0.5f);
             SkChopQuadAt2(fPts, dst, 0.5f);
             SkChopQuadAt2(fPts, dst, 0.5f);
             SkChopQuadAt2(fPts, dst, 0.5f);
         }
     }
 };
 DEF_BENCH( return new ChopQuadAt1; )
 
 class ChopCubicAt0 : public QuadBenchBase {
 public:
     ChopCubicAt0() : QuadBenchBase("chopcubicat0") {}
 protected:
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         SkPoint dst[7];
         for (int outer = 0; outer < loops; ++outer) {
             SkChopCubicAt(fPts, dst, 0.5f);
             SkChopCubicAt(fPts, dst, 0.5f);
             SkChopCubicAt(fPts, dst, 0.5f);
             SkChopCubicAt(fPts, dst, 0.5f);
         }
     }
 };
 DEF_BENCH( return new ChopCubicAt0; )
 
 class ChopCubicAt1 : public QuadBenchBase {
 public:
     ChopCubicAt1() : QuadBenchBase("chopcubicat1") {}
 protected:
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         SkPoint dst[7];
         for (int outer = 0; outer < loops; ++outer) {
             SkChopCubicAt2(fPts, dst, 0.5f);
             SkChopCubicAt2(fPts, dst, 0.5f);
             SkChopCubicAt2(fPts, dst, 0.5f);
             SkChopCubicAt2(fPts, dst, 0.5f);
         }
     }
 };
 DEF_BENCH( return new ChopCubicAt1; )