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

gm/imagefiltersbase.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 "SkColorFilter.h"
@@ skipping 19 matching lines @@
         return SkNEW(FailImageFilter);
     }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter)
 
 protected:
     FailImageFilter() : INHERITED(0, NULL) {}
 
     bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                       SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE {
+                       SkBitmap* result, SkIPoint* offset) const override {
         return false;
     }
 
 private:
     typedef SkImageFilter INHERITED;
 };
 
 static FailImageFilter::Registrar gReg0;
 
 SkFlattenable* FailImageFilter::CreateProc(SkReadBuffer& buffer) {
@@ skipping 21 matching lines @@
     static IdentityImageFilter* Create(SkImageFilter* input = NULL) {
         return SkNEW_ARGS(IdentityImageFilter, (input));
     }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(IdentityImageFilter)
 protected:
     IdentityImageFilter(SkImageFilter* input) : INHERITED(1, &input) {}
 
     bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                       SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE {
+                       SkBitmap* result, SkIPoint* offset) const override {
         *result = src;
         offset->set(0, 0);
         return true;
     }
 
 private:
     typedef SkImageFilter INHERITED;
 };
 
 static IdentityImageFilter::Registrar gReg1;
@@ skipping 94 matching lines @@
                        &paint);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class ImageFiltersBaseGM : public skiagm::GM {
 public:
     ImageFiltersBaseGM () {}
 
 protected:
-    SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() override {
         return SkString("imagefiltersbase");
     }
 
-    SkISize onISize() SK_OVERRIDE { return SkISize::Make(700, 500); }
+    SkISize onISize() override { return SkISize::Make(700, 500); }
 
     void draw_frame(SkCanvas* canvas, const SkRect& r) {
         SkPaint paint;
         paint.setStyle(SkPaint::kStroke_Style);
         paint.setColor(SK_ColorRED);
         canvas->drawRect(r, paint);
     }
 
-    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) override {
         void (*drawProc[])(SkCanvas*, const SkRect&, SkImageFilter*) = {
             draw_paint,
             draw_line, draw_rect, draw_path, draw_text,
             draw_bitmap,
             draw_sprite
         };
 
         SkColorFilter* cf = SkColorFilter::CreateModeFilter(SK_ColorRED,
                                                      SkXfermode::kSrcIn_Mode);
         SkImageFilter* filters[] = {
@@ skipping 40 matching lines @@
 /*
  *  Want to test combos of filter and LCD text, to be sure we disable LCD in the presence of
  *  a filter.
  */
 class ImageFiltersTextBaseGM : public skiagm::GM {
     SkString fSuffix;
 public:
     ImageFiltersTextBaseGM(const char suffix[]) : fSuffix(suffix) {}
 
 protected:
-    SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() override {
         SkString name;
         name.printf("%s_%s", "textfilter", fSuffix.c_str());
         return name;
     }
 
-    SkISize onISize() SK_OVERRIDE { return SkISize::Make(512, 342); }
+    SkISize onISize() override { return SkISize::Make(512, 342); }
 
     void drawWaterfall(SkCanvas* canvas, const SkPaint& origPaint) {
         const uint32_t flags[] = {
             0,
             SkPaint::kAntiAlias_Flag,
             SkPaint::kAntiAlias_Flag | SkPaint::kLCDRenderText_Flag,
         };
         SkPaint paint(origPaint);
         paint.setTextSize(30);
 
         SkAutoCanvasRestore acr(canvas, true);
         for (size_t i = 0; i < SK_ARRAY_COUNT(flags); ++i) {
             paint.setFlags(flags[i]);
             canvas->drawText("Hamburgefons", 11, 0, 0, paint);
             canvas->translate(0, 40);
         }
     }
 
     virtual void installFilter(SkPaint* paint) = 0;
 
-    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) override {
         SkPaint paint;
 
         canvas->translate(20, 40);
 
         for (int doSaveLayer = 0; doSaveLayer <= 1; ++doSaveLayer) {
             SkAutoCanvasRestore acr(canvas, true);
             for (int useFilter = 0; useFilter <= 1; ++useFilter) {
                 SkAutoCanvasRestore acr2(canvas, true);
 
                 SkPaint paint;
@@ skipping 15 matching lines @@
     }
     
 private:
     typedef GM INHERITED;
 };
 
 class ImageFiltersText_IF : public ImageFiltersTextBaseGM {
 public:
     ImageFiltersText_IF() : ImageFiltersTextBaseGM("image") {}
 
-    void installFilter(SkPaint* paint) SK_OVERRIDE {
+    void installFilter(SkPaint* paint) override {
         paint->setImageFilter(SkBlurImageFilter::Create(1.5f, 1.5f))->unref();
     }
 };
 DEF_GM( return new ImageFiltersText_IF; )
 
 class ImageFiltersText_CF : public ImageFiltersTextBaseGM {
 public:
     ImageFiltersText_CF() : ImageFiltersTextBaseGM("color") {}
 
-    void installFilter(SkPaint* paint) SK_OVERRIDE {
+    void installFilter(SkPaint* paint) override {
         paint->setColorFilter(SkColorFilter::CreateModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode))->unref();
     }
 };
 DEF_GM( return new ImageFiltersText_CF; )