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

samplecode/SampleQuadStroker.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "sk_tool_utils.h"
 #include "SampleCode.h"
 #include "SkView.h"
@@ skipping 157 matching lines @@
         fCircleButton.fLabel = 'O';
         fCircleButton.fEnabled = false;
         fCircleButton.fFill = false;
         fTextButton.fLabel = 'T';
         fTextButton.fEnabled = false;
         fAnimate = true;
         setAsNeeded();
     }
 
 protected:
-    bool onQuery(SkEvent* evt) SK_OVERRIDE {
+    bool onQuery(SkEvent* evt) override {
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "QuadStroker");
             return true;
         }
         SkUnichar uni;
         if (fTextButton.fEnabled && SampleCode::CharQ(*evt, &uni)) {
             switch (uni) {
                 case ' ':
                     fText = "";
                     break;
                 case '-':
                     fTextSize = SkTMax(1.0f, fTextSize - 1);
                     break;
                 case '+':
                 case '=':
                     fTextSize += 1;
                     break;
                 default:
                     fText.appendUnichar(uni);
             }
             this->inval(NULL);
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
 
-    void onSizeChange() SK_OVERRIDE {
+    void onSizeChange() override {
         fWeightControl.setXYWH(this->width() - 150, 30, 30, 400);
         fErrorControl.setXYWH(this->width() - 100, 30, 30, 400);
         fWidthControl.setXYWH(this->width() -  50, 30, 30, 400);
         int buttonOffset = 450;
         fCubicButton.fBounds.setXYWH(this->width() - 50, SkIntToScalar(buttonOffset), 30, 30);
         buttonOffset += 50;
         fConicButton.fBounds.setXYWH(this->width() - 50, SkIntToScalar(buttonOffset), 30, 30);
         buttonOffset += 50;
         fQuadButton.fBounds.setXYWH(this->width() - 50, SkIntToScalar(buttonOffset), 30, 30);
         buttonOffset += 50;
@@ skipping 222 matching lines @@
 
     void setAsNeeded() {
         if (fConicButton.fEnabled || fCubicButton.fEnabled || fQuadButton.fEnabled
                 || fRRectButton.fEnabled || fCircleButton.fEnabled) {
             setForGeometry();
         } else {
             setForText();
         }
     }
 
-    void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+    void onDrawContent(SkCanvas* canvas) override {
         SkPath path;
         SkScalar width = fWidth;
 
         if (fCubicButton.fEnabled) {
             path.moveTo(fPts[0]);
             path.cubicTo(fPts[1], fPts[2], fPts[3]);
             setForGeometry();
             draw_stroke(canvas, path, width, 950, false);
         }
 
@@ skipping 85 matching lines @@
         this->inval(NULL);
     }
 
     class MyClick : public Click {
     public:
         int fIndex;
         MyClick(SkView* target, int index) : Click(target), fIndex(index) {}
     };
 
     virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y,
-                                              unsigned modi) SK_OVERRIDE {
+                                              unsigned modi) override {
         for (size_t i = 0; i < SK_ARRAY_COUNT(fPts); ++i) {
             if (hittest(fPts[i], x, y)) {
                 return new MyClick(this, (int)i);
             }
         }
         const SkRect& rectPt = SkRect::MakeXYWH(x, y, 1, 1);
         if (fWeightControl.contains(rectPt)) {
             return new MyClick(this, (int) SK_ARRAY_COUNT(fPts) + 1);
         }
 #if !defined SK_LEGACY_STROKE_CURVES && defined(SK_DEBUG)
@@ skipping 31 matching lines @@
             return new MyClick(this, (int) SK_ARRAY_COUNT(fPts) + 9);
         }
         return this->INHERITED::onFindClickHandler(x, y, modi);
     }
 
     static SkScalar MapScreenYtoValue(int y, const SkRect& control, SkScalar min,
             SkScalar max) {
         return (SkIntToScalar(y) - control.fTop) / control.height() * (max - min) + min;
     }
 
-    bool onClick(Click* click) SK_OVERRIDE {
+    bool onClick(Click* click) override {
         int index = ((MyClick*)click)->fIndex;
         if (index < (int) SK_ARRAY_COUNT(fPts)) {
             fPts[index].offset(SkIntToScalar(click->fICurr.fX - click->fIPrev.fX),
                                SkIntToScalar(click->fICurr.fY - click->fIPrev.fY));
             this->inval(NULL);
         } else if (index == (int) SK_ARRAY_COUNT(fPts) + 1) {
             fWeight = MapScreenYtoValue(click->fICurr.fY, fWeightControl, 0, 5);
         }
 #if !defined SK_LEGACY_STROKE_CURVES && defined(SK_DEBUG)
         else if (index == (int) SK_ARRAY_COUNT(fPts) + 2) {
@@ skipping 11 matching lines @@
     }
 
 private:
     typedef SkView INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static SkView* F2() { return new QuadStrokerView; }
 static SkViewRegister gR2(F2);