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

gm/surface.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 "gm.h"
 #include "SkGradientShader.h"
 #include "SkSurface.h"
@@ skipping 43 matching lines @@
     paint.setTextSize(32);
     paint.setTextAlign(SkPaint::kCenter_Align);
     canvas->drawText(label, strlen(label), W / 2, H * 3 / 4, paint);
 }
 
 class SurfacePropsGM : public skiagm::GM {
 public:
     SurfacePropsGM() {}
 
 protected:
-    SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() override {
         return SkString("surfaceprops");
     }
 
-    SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() override {
         return SkISize::Make(W * 4, H * 5);
     }
 
-    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) override {
         GrContext* ctx = canvas->getGrContext();
 
         // must be opaque to have a hope of testing LCD text
         const SkImageInfo info = SkImageInfo::MakeN32(W, H, kOpaque_SkAlphaType);
 
         const struct {
             SkPixelGeometry fGeo;
             const char*     fLabel;
         } rec[] = {
             { kUnknown_SkPixelGeometry, "Unknown" },
@@ skipping 28 matching lines @@
 static bool equal(const SkSurfaceProps& a, const SkSurfaceProps& b) {
     return a.flags() == b.flags() && a.pixelGeometry() == b.pixelGeometry();
 }
 #endif
 
 class NewSurfaceGM : public skiagm::GM {
 public:
     NewSurfaceGM() {}
 
 protected:
-    SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() override {
         return SkString("surfacenew");
     }
 
-    SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() override {
         return SkISize::Make(300, 140);
     }
 
     static void drawInto(SkCanvas* canvas) {
         canvas->drawColor(SK_ColorRED);
     }
 
-    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) override {
         SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
 
         SkAutoTUnref<SkSurface> surf(canvas->newSurface(info, NULL));
         if (!surf.get()) {
             surf.reset(SkSurface::NewRaster(info));
         }
         drawInto(surf->getCanvas());
 
         SkAutoTUnref<SkImage> image(surf->newImageSnapshot());
         canvas->drawImage(image, 10, 10, NULL);
 
         SkAutoTUnref<SkSurface> surf2(image->newSurface(info, NULL));
         drawInto(surf2->getCanvas());
 
         // Assert that the props were communicated transitively through the first image
         SkASSERT(equal(surf->props(), surf2->props()));
 
         SkAutoTUnref<SkImage> image2(surf2->newImageSnapshot());
         canvas->drawImage(image2, 10 + SkIntToScalar(image->width()) + 10, 10, NULL);
     }
 
 private:
     typedef GM INHERITED;
 };
 DEF_GM( return new NewSurfaceGM )