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

gm/bitmaprect.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
@@ skipping 17 matching lines @@
     canvas.drawCircle(32, 32, 32, paint);
 }
 
 class DrawBitmapRect2 : public skiagm::GM {
     bool fUseIRect;
 public:
     DrawBitmapRect2(bool useIRect) : fUseIRect(useIRect) {
     }
 
 protected:
-    SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() override {
         SkString str;
         str.printf("bitmaprect_%s", fUseIRect ? "i" : "s");
         return str;
     }
 
-    SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() override {
         return SkISize::Make(640, 480);
     }
 
-    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) override {
         canvas->drawColor(0xFFCCCCCC);
 
         const SkIRect src[] = {
             { 0, 0, 32, 32 },
             { 0, 0, 80, 80 },
             { 32, 32, 96, 96 },
             { -32, -32, 32, 32, }
         };
 
         SkPaint paint;
@@ skipping 58 matching lines @@
 //                           |    |
 //                         __|____|__
 //                           |    |
 class DrawBitmapRect3 : public skiagm::GM {
 public:
     DrawBitmapRect3() {
         this->setBGColor(SK_ColorBLACK);
     }
 
 protected:
-    SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() override {
         SkString str;
         str.printf("3x3bitmaprect");
         return str;
     }
 
-    SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() override {
         return SkISize::Make(640, 480);
     }
 
-    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) override {
 
         SkBitmap bitmap;
         make_3x3_bitmap(&bitmap);
 
         SkRect srcR = { 0.5f, 0.5f, 2.5f, 2.5f };
         SkRect dstR = { 100, 100, 300, 200 };
 
         canvas->drawBitmapRectToRect(bitmap, &srcR, dstR, NULL);
     }
 
@@ skipping 28 matching lines @@
 class DrawBitmapRect4 : public skiagm::GM {
     bool fUseIRect;
     SkBitmap fBigBitmap;
 
 public:
     DrawBitmapRect4(bool useIRect) : fUseIRect(useIRect) {
         this->setBGColor(0x88444444);
     }
 
 protected:
-    SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() override {
         SkString str;
         str.printf("bigbitmaprect_%s", fUseIRect ? "i" : "s");
         return str;
     }
 
-    SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() override {
         return SkISize::Make(640, 480);
     }
 
-    void onOnceBeforeDraw() SK_OVERRIDE {
+    void onOnceBeforeDraw() override {
         make_big_bitmap(&fBigBitmap);
     }
 
-    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) override {
 
         SkXfermode* mode = SkXfermode::Create(SkXfermode::kXor_Mode);
 
         SkPaint paint;
         paint.setAlpha(128);
         paint.setXfermode(mode)->unref();
 
         SkRect srcR1 = { 0.0f, 0.0f, 4096.0f, 2040.0f };
         SkRect dstR1 = { 10.1f, 10.1f, 629.9f, 400.9f };
 
@@ skipping 18 matching lines @@
     typedef skiagm::GM INHERITED;
 };
 
 class BitmapRectRounding : public skiagm::GM {
     SkBitmap fBM;
 
 public:
     BitmapRectRounding() {}
 
 protected:
-    SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() override {
         SkString str;
         str.printf("bitmaprect_rounding");
         return str;
     }
 
-    SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() override {
         return SkISize::Make(640, 480);
     }
 
-    void onOnceBeforeDraw() SK_OVERRIDE {
+    void onOnceBeforeDraw() override {
         fBM.allocN32Pixels(10, 10);
         fBM.eraseColor(SK_ColorBLUE);
     }
 
     // This choice of coordinates and matrix land the bottom edge of the clip (and bitmap dst)
     // at exactly 1/2 pixel boundary. However, drawBitmapRect may lose precision along the way.
     // If it does, we may see a red-line at the bottom, instead of the bitmap exactly matching
     // the clip (in which case we should see all blue).
     // The correct image should be all blue.
-    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) override {
         SkPaint paint;
         paint.setColor(SK_ColorRED);
 
         const SkRect r = SkRect::MakeXYWH(1, 1, 110, 114);
         canvas->scale(0.9f, 0.9f);
 
         // the drawRect shows the same problem as clipRect(r) followed by drawcolor(red)
         canvas->drawRect(r, paint);
         canvas->drawBitmapRect(fBM, NULL, r, NULL);
     }
@@ skipping 18 matching lines @@
 static skiagm::GMRegistry reg0(MyFactory0);
 static skiagm::GMRegistry reg1(MyFactory1);
 
 static skiagm::GMRegistry reg2(MyFactory2);
 
 #ifndef SK_BUILD_FOR_ANDROID
 static skiagm::GMRegistry reg3(MyFactory3);
 static skiagm::GMRegistry reg4(MyFactory4);
 #endif