Cleanup: More override fixes - another round.

samplecode/SampleRotateCircles.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 "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
@@ skipping 110 matching lines @@
                 float d = sqrtf((x - cx)*(x - cx) + (y - cy)*(y - cy));
                 if (d <= radius) {
                     *bm.getAddr32(x, y) = SkPackARGB32(0xFF, 0, 0, 0);
                 }
             }
         }
 
         canvas->drawBitmap(bm, 0, 0, NULL);
     }
 
-    virtual void onDrawContent(SkCanvas* canvas) {
+    virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
         SkScalar radius = 256;
         canvas->translate(10, 10);
 
         draw_real_circle(canvas, radius);
 
         SkPaint paint;
         paint.setAntiAlias(true);
 
         paint.setColor(0x80FF0000);
         canvas->drawCircle(radius, radius, radius, paint);
@@ skipping 95 matching lines @@
 
 protected:
     virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "RotateCircles3");
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
 
-    virtual void onSizeChange() {
+    virtual void onSizeChange() SK_OVERRIDE {
         fErrorControl.setXYWH(this->width() - 100, 30, 30, 400);
         fWidthControl.setXYWH(this->width() -  50, 30, 30, 400);
         fCubicButton.fBounds.setXYWH(this->width() - 50, 450, 30, 30);
         fQuadButton.fBounds.setXYWH(this->width() - 50, 500, 30, 30);
         fRRectButton.fBounds.setXYWH(this->width() - 50, 550, 30, 30);
         this->INHERITED::onSizeChange();
     }
 
     void draw_points(SkCanvas* canvas, const SkPath& path, SkColor color,
                      bool show_lines) {
@@ skipping 85 matching lines @@
         SkString label;
         label.printf("%0.3g", value);
         paint.setColor(0xFF000000);
         paint.setTextSize(11.0f);
         paint.setStyle(SkPaint::kFill_Style);
         canvas->drawText(label.c_str(), label.size(), bounds.fLeft + 5, yPos - 5, paint);
         paint.setTextSize(13.0f);
         canvas->drawText(name, strlen(name), bounds.fLeft, bounds.bottom() + 11, paint);
     }
 
-    virtual void onDrawContent(SkCanvas* canvas) {
+    virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
         SkPath path;
         SkScalar width = fWidth;
 
         if (fCubicButton.fEnabled) {
             path.moveTo(fPts[0]);
             path.cubicTo(fPts[1], fPts[2], fPts[3]);
             draw_stroke(canvas, path, width);
         }
 
         if (fQuadButton.fEnabled) {
@@ skipping 79 matching lines @@
             return new MyClick(this, (int) SK_ARRAY_COUNT(fPts) + 6);
         }
         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;
     }
 
-    virtual bool onClick(Click* click) {
+    virtual bool onClick(Click* click) SK_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);
         }
 #if QUAD_STROKE_APPROXIMATION && defined(SK_DEBUG)
         else if (index == (int) SK_ARRAY_COUNT(fPts) + 1) {
             gDebugStrokerError = MapScreenYtoValue(click->fICurr.fY, fErrorControl,
                     kStrokerErrorMin, kStrokerErrorMax);
@@ skipping 12 matching lines @@
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static SkView* F0() { return new RotateCirclesView; }
 static SkViewRegister gR0(F0);
 static SkView* F1() { return new TestCirclesView; }
 static SkViewRegister gR1(F1);
 static SkView* F2() { return new TestStrokeView; }
 static SkViewRegister gR2(F2);