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

gm/convexpolyclip.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"
 
@@ skipping 61 matching lines @@
 /**
  * This GM tests convex polygon clips.
  */
 class ConvexPolyClip : public GM {
 public:
     ConvexPolyClip() {
         this->setBGColor(0xFFFFFFFF);
     }
 
 protected:
-    SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() override {
         return SkString("convex_poly_clip");
     }
 
-    SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() override {
         // When benchmarking the saveLayer set of draws is skipped.
         int w = 435;
         if (kBench_Mode != this->getMode()) {
             w *= 2;
         }
         return SkISize::Make(w, 540);
     }
 
-    void onOnceBeforeDraw() SK_OVERRIDE {
+    void onOnceBeforeDraw() override {
         SkPath tri;
         tri.moveTo(5.f, 5.f);
         tri.lineTo(100.f, 20.f);
         tri.lineTo(15.f, 100.f);
 
         fClips.addToTail()->setPath(tri);
 
         SkPath hexagon;
         static const SkScalar kRadius = 45.f;
         const SkPoint center = { kRadius, kRadius };
@@ skipping 22 matching lines @@
         SkRect rect = SkRect::MakeLTRB(10.f, 12.f, 80.f, 86.f);
         rotRect.addRect(rect);
         SkMatrix rotM;
         rotM.setRotate(23.f, rect.centerX(), rect.centerY());
         rotRect.transform(rotM);
         fClips.addToTail()->setPath(rotRect);
 
         fBmp = make_bmp(100, 100);
     }
 
-    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) override {
         SkScalar y = 0;
         static const SkScalar kMargin = 10.f;
 
         SkPaint bgPaint;
         bgPaint.setAlpha(0x15);
         SkISize size = canvas->getDeviceSize();
         SkRect dstRect = SkRect::MakeWH(SkIntToScalar(size.fWidth),
                                         SkIntToScalar(size.fHeight));
         canvas->drawBitmapRectToRect(fBmp, NULL, dstRect, &bgPaint);
 
@@ skipping 58 matching lines @@
                     canvas->restore();
                     x += textW + 2 * kMargin;
                 }
                 y += fBmp.height() + kMargin;
             }
             y = 0;
             startX += 2 * fBmp.width() + SkScalarCeilToInt(2 * textW) + 6 * kMargin;
         }
     }
 
-    bool runAsBench() const SK_OVERRIDE { return true; }
+    bool runAsBench() const override { return true; }
 
 private:
     class Clip {
     public:
         enum ClipType {
             kNone_ClipType,
             kPath_ClipType,
             kRect_ClipType
         };
 
@@ skipping 64 matching lines @@
 
     SkTLList<Clip>   fClips;
     SkBitmap         fBmp;
 
     typedef GM INHERITED;
 };
 
 DEF_GM( return SkNEW(ConvexPolyClip); )
 
 }