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

samplecode/SamplePath.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 "SkAnimTimer.h"
@@ skipping 177 matching lines @@
             for (size_t j = 0; j < SK_ARRAY_COUNT(fPath); j++) {
                 this->drawPath(canvas, fPath[j], gJoins[i]);
                 canvas->translate(200, 0);
             }
             canvas->restore();
 
             canvas->translate(0, 200);
         }
     }
     
-    bool onAnimate(const SkAnimTimer& timer) SK_OVERRIDE {
+    bool onAnimate(const SkAnimTimer& timer) override {
         SkScalar currSecs = timer.scaled(100);
         SkScalar delta = currSecs - fPrevSecs;
         fPrevSecs = currSecs;
 
         fStroke += fDStroke * delta;
         if (fStroke > fMaxStroke || fStroke < fMinStroke) {
             fDStroke = -fDStroke;
         }
         return true;
     }
 
-    SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
+    SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override {
         fShowHairline = !fShowHairline;
         this->inval(NULL);
         return this->INHERITED::onFindClickHandler(x, y, modi);
     }
 
 private:
     typedef SampleView INHERITED;
 };
 DEF_SAMPLE( return new PathView; )
 
@@ skipping 44 matching lines @@
         fSkeletonPaint.setColor(SK_ColorRED);
     }
 
     void toggle(bool& value) {
         value = !value;
         this->inval(NULL);
     }
 
 protected:
     // overrides from SkEventSink
-    bool onQuery(SkEvent* evt) SK_OVERRIDE {
+    bool onQuery(SkEvent* evt) override {
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "ArcTo");
             return true;
         }
         SkUnichar uni;
         if (SampleCode::CharQ(*evt, &uni)) {
             switch (uni) {
                 case '1': this->toggle(fDoFrame); return true;
                 case '2': this->toggle(fDoArcTo); return true;
                 case '3': this->toggle(fDoCorner); return true;
                 case '4': this->toggle(fDoConic); return true;
                 default: break;
             }
         }
         return this->INHERITED::onQuery(evt);
     }
     
     void makePath(SkPath* path) {
         path->moveTo(fPts[0]);
         for (int i = 1; i < N; ++i) {
             path->lineTo(fPts[i]);
         }
         if (!fDoFrame) {
             path->close();
         }
     }
 
-    void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+    void onDrawContent(SkCanvas* canvas) override {
         canvas->drawPoints(SkCanvas::kPoints_PointMode, N, fPts, fPtsPaint);
 
         SkPath path;
         this->makePath(&path);
 
         if (fDoCorner) {
             canvas->drawPath(path, fCornerPaint);
         }
         if (fDoArcTo) {
             canvas->drawPath(path, fArcToPaint);
         }
 
         canvas->drawPath(path, fSkeletonPaint);
     }
 
-    bool onClick(Click* click) SK_OVERRIDE {
+    bool onClick(Click* click) override {
         int32_t index;
         if (click->fMeta.findS32("index", &index)) {
             SkASSERT((unsigned)index < N);
             fPts[index] = click->fCurr;
             this->inval(NULL);
             return true;
         }
         return false;
     }
 
-    SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
+    SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override {
         const SkScalar tol = 4;
         const SkRect r = SkRect::MakeXYWH(x - tol, y - tol, tol * 2, tol * 2);
         for (int i = 0; i < N; ++i) {
             if (r.intersects(SkRect::MakeXYWH(fPts[i].fX, fPts[i].fY, 1, 1))) {
                 Click* click = new Click(this);
                 click->fMeta.setS32("index", i);
                 return click;
             }
         }
         return this->INHERITED::onFindClickHandler(x, y, modi);
     }
 
 private:
     typedef SampleView INHERITED;
 };
 DEF_SAMPLE( return new ArcToView; )