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

gm/downsamplebitmap.cpp

 /*
  * Copyright 2013 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 "Resources.h"
@@ skipping 39 matching lines @@
 
     const char* filterQualityToString() {
         static const char *filterQualityNames[] = {
             "none", "low", "medium", "high"
         };
         return filterQualityNames[fFilterQuality];
     }
 
 protected:
 
-    SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() override {
         return fName;
     }
 
-    SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() override {
         make_bitmap_wrapper();
         return SkISize::Make(fBM.width(), 4 * fBM.height());
     }
 
     void make_bitmap_wrapper() {
         if (!fBitmapMade) {
             fBitmapMade = true;
             make_bitmap();
         }
     }
 
     virtual void make_bitmap() = 0;
 
-    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) override {
         make_bitmap_wrapper();
 
         int curY = 0;
         int curHeight;
         float curScale = 1;
         do {
 
             SkMatrix matrix;
             matrix.setScale( curScale, curScale );
 
@@ skipping 20 matching lines @@
   public:
       DownsampleBitmapTextGM(float textSize, SkFilterQuality filterQuality)
       : INHERITED(filterQuality), fTextSize(textSize)
         {
             fName.printf("downsamplebitmap_text_%s_%.2fpt", this->filterQualityToString(), fTextSize);
         }
 
   protected:
       float fTextSize;
 
-      void make_bitmap() SK_OVERRIDE {
+      void make_bitmap() override {
           fBM.allocN32Pixels(int(fTextSize * 8), int(fTextSize * 6));
           SkCanvas canvas(fBM);
           canvas.drawColor(SK_ColorWHITE);
 
           SkPaint paint;
           paint.setAntiAlias(true);
           paint.setSubpixelText(true);
           paint.setTextSize(fTextSize);
 
           setTypeface(&paint, "Times", SkTypeface::kNormal);
@@ skipping 14 matching lines @@
       DownsampleBitmapCheckerboardGM(int size, int numChecks, SkFilterQuality filterQuality)
       : INHERITED(filterQuality), fSize(size), fNumChecks(numChecks)
         {
             fName.printf("downsamplebitmap_checkerboard_%s_%d_%d", this->filterQualityToString(), fSize, fNumChecks);
         }
 
   protected:
       int fSize;
       int fNumChecks;
 
-      void make_bitmap() SK_OVERRIDE {
+      void make_bitmap() override {
           make_checker(&fBM, fSize, fNumChecks);
       }
   private:
       typedef DownsampleBitmapGM INHERITED;
 };
 
 class DownsampleBitmapImageGM: public DownsampleBitmapGM {
   public:
       DownsampleBitmapImageGM(const char filename[], SkFilterQuality filterQuality)
       : INHERITED(filterQuality), fFilename(filename)
         {
             fName.printf("downsamplebitmap_image_%s_%s", this->filterQualityToString(), filename);
         }
 
   protected:
       SkString fFilename;
       int fSize;
 
-      void make_bitmap() SK_OVERRIDE {
+      void make_bitmap() override {
           SkImageDecoder* codec = NULL;
           SkString resourcePath = GetResourcePath(fFilename.c_str());
           SkFILEStream stream(resourcePath.c_str());
           if (stream.isValid()) {
               codec = SkImageDecoder::Factory(&stream);
           }
           if (codec) {
               stream.rewind();
               codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode);
               SkDELETE(codec);
@@ skipping 17 matching lines @@
 public:
     SkBitmap    fBM;
 
     ShowMipLevels() {
         this->setBGColor(0xFFDDDDDD);
         make_checker(&fBM, 512, 256);
     }
 
 protected:
 
-    SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() override {
         return SkString("showmiplevels");
     }
 
-    SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() override {
         return SkISize::Make(fBM.width() + 8, 2 * fBM.height() + 80);
     }
 
-    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) override {
         SkScalar x = 4;
         SkScalar y = 4;
         canvas->drawBitmap(fBM, x, y, NULL);
         y += fBM.height() + 4;
 
         SkAutoTUnref<SkMipMap> mm(SkMipMap::Build(fBM, NULL));
 
         SkMipMap::Level level;
         SkScalar scale = 0.5f;
         while (mm->extractLevel(scale, &level)) {
@@ skipping 34 matching lines @@
 DEF_GM( return new DownsampleBitmapCheckerboardGM(512,256, kLow_SkFilterQuality); )
 DEF_GM( return new DownsampleBitmapImageGM("mandrill_512.png", kLow_SkFilterQuality); )
 DEF_GM( return new DownsampleBitmapImageGM("mandrill_132x132_12x12.astc",
                                            kLow_SkFilterQuality); )
 
 DEF_GM( return new DownsampleBitmapTextGM(72, kNone_SkFilterQuality); )
 DEF_GM( return new DownsampleBitmapCheckerboardGM(512,256, kNone_SkFilterQuality); )
 DEF_GM( return new DownsampleBitmapImageGM("mandrill_512.png", kNone_SkFilterQuality); )
 DEF_GM( return new DownsampleBitmapImageGM("mandrill_132x132_12x12.astc",
                                            kNone_SkFilterQuality); )