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

gm/texturedomaineffect.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.
  */
 
 // This test only works with the GPU backend.
 
@@ skipping 12 matching lines @@
 /**
  * This GM directly exercises GrTextureDomainEffect.
  */
 class TextureDomainEffect : public GM {
 public:
     TextureDomainEffect() {
         this->setBGColor(0xFFFFFFFF);
     }
 
 protected:
-    SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() override {
         return SkString("texture_domain_effect");
     }
 
-    SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() override {
         const SkScalar canvasWidth = kDrawPad +
                 (kTargetWidth + 2 * kDrawPad) * GrTextureDomain::kModeCount +
                 kTestPad * GrTextureDomain::kModeCount;
         return SkISize::Make(SkScalarCeilToInt(canvasWidth), 800);
     }
 
-    void onOnceBeforeDraw() SK_OVERRIDE {
+    void onOnceBeforeDraw() override {
         fBmp.allocN32Pixels(kTargetWidth, kTargetHeight);
         SkCanvas canvas(fBmp);
         canvas.clear(0x00000000);
         SkPaint paint;
 
         SkColor colors1[] = { SK_ColorCYAN, SK_ColorLTGRAY, SK_ColorGRAY };
         paint.setShader(SkGradientShader::CreateSweep(65.f, 75.f, colors1,
                                                       NULL, SK_ARRAY_COUNT(colors1)))->unref();
         canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f,
                                          fBmp.width() + 10.f, fBmp.height() + 10.f), paint);
 
         SkColor colors2[] = { SK_ColorMAGENTA, SK_ColorLTGRAY, SK_ColorYELLOW };
         paint.setShader(SkGradientShader::CreateSweep(45.f, 55.f, colors2, NULL,
                                                       SK_ARRAY_COUNT(colors2)))->unref();
         paint.setXfermodeMode(SkXfermode::kDarken_Mode);
         canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f,
                                          fBmp.width() + 10.f, fBmp.height() + 10.f), paint);
 
         SkColor colors3[] = { SK_ColorBLUE, SK_ColorLTGRAY, SK_ColorGREEN };
         paint.setShader(SkGradientShader::CreateSweep(25.f, 35.f, colors3, NULL,
                                                       SK_ARRAY_COUNT(colors3)))->unref();
         paint.setXfermodeMode(SkXfermode::kLighten_Mode);
         canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f,
                                          fBmp.width() + 10.f, fBmp.height() + 10.f), paint);
     }
 
-    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) override {
         GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
         if (NULL == rt) {
             return;
         }
         GrContext* context = rt->getContext();
         if (NULL == context) {
             this->drawGpuOnlyMessage(canvas);
             return;
         }
 
@@ skipping 70 matching lines @@
 };
 
 // Windows builds did not like SkScalar initialization in class :(
 const SkScalar TextureDomainEffect::kDrawPad = 10.f;
 const SkScalar TextureDomainEffect::kTestPad = 10.f;
 
 DEF_GM( return SkNEW(TextureDomainEffect); )
 }
 
 #endif