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

samplecode/SampleStrokePath.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 "SampleCode.h"
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
@@ skipping 81 matching lines @@
     { SkPaint::kFill_Style,             SkPaint::kMiter_Join,   0 },
     { SkPaint::kStroke_Style,           SkPaint::kMiter_Join,   0 },
     { SkPaint::kStroke_Style,           SkPaint::kMiter_Join,   10 },
     { SkPaint::kStrokeAndFill_Style,    SkPaint::kMiter_Join,   10 },
 };
 
 class StrokePathView : public SampleView {
     SkScalar    fWidth;
     SkPath      fPath;
 protected:
-    void onOnceBeforeDraw() SK_OVERRIDE {
+    void onOnceBeforeDraw() override {
 //        test_blur();
         fWidth = SkIntToScalar(120);
 
 #if 0
         const char str[] =
             "M 0, 3"
             "C 10, -10, 30, -10, 0, 28"
             "C -30, -10, -10, -10, 0, 3"
             "Z";
         SkParsePath::FromSVGString(str, &fPath);
 #else
         fPath.addCircle(0, 0, SkIntToScalar(50), SkPath::kCW_Direction);
         fPath.addCircle(0, SkIntToScalar(-50), SkIntToScalar(30), SkPath::kCW_Direction);
 #endif
 
         scale_to_width(&fPath, fWidth);
         const SkRect& bounds = fPath.getBounds();
         fPath.offset(-bounds.fLeft, -bounds.fTop);
 
         this->setBGColor(0xFFDDDDDD);
     }
 
     // overrides from SkEventSink
-    bool onQuery(SkEvent* evt) SK_OVERRIDE {
+    bool onQuery(SkEvent* evt) override {
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "StrokePath");
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
 
     SkRandom rand;
 
     void drawSet(SkCanvas* canvas, SkPaint* paint) {
         SkAutoCanvasRestore acr(canvas, true);
 
         for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); i++) {
             paint->setStyle(gRec[i].fStyle);
             paint->setStrokeJoin(gRec[i].fJoin);
             paint->setStrokeWidth(SkIntToScalar(gRec[i].fStrokeWidth));
             canvas->drawPath(fPath, *paint);
             canvas->translate(fWidth * 5 / 4, 0);
         }
     }
 
-    void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+    void onDrawContent(SkCanvas* canvas) override {
         test_huge_stroke(canvas); return;
         canvas->translate(SkIntToScalar(10), SkIntToScalar(10));
 
         SkPaint paint;
         paint.setAntiAlias(true);
 
         if (true) {
             canvas->drawColor(SK_ColorBLACK);
 
             paint.setTextSize(24);
@@ skipping 43 matching lines @@
 
         fPath.setFillType(SkPath::kWinding_FillType);
         drawSet(canvas, &paint);
 
         canvas->translate(0, fPath.getBounds().height() * 5 / 4);
         fPath.setFillType(SkPath::kEvenOdd_FillType);
         drawSet(canvas, &paint);
     }
 
     virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y,
-                                              unsigned modi) SK_OVERRIDE {
+                                              unsigned modi) override {
         this->inval(NULL);
         return this->INHERITED::onFindClickHandler(x, y, modi);
     }
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new StrokePathView; }
 static SkViewRegister reg(MyFactory);