Cleanup: More override fixes - another round.

gm/filltypes.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 "gm.h"
 
 namespace skiagm {
@@ skipping 11 matching lines @@
             fPath.addCircle(SkIntToScalar(50), SkIntToScalar(50), radius);
             fPath.addCircle(SkIntToScalar(100), SkIntToScalar(100), radius);
         }
     }
 
 protected:
     virtual uint32_t onGetFlags() const SK_OVERRIDE {
         return kSkipTiled_Flag;
     }
 
-    virtual SkString onShortName() {
+    virtual SkString onShortName() SK_OVERRIDE {
         return SkString("filltypes");
     }
 
-    virtual SkISize onISize() {
+    virtual SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(835, 840);
     }
 
     void showPath(SkCanvas* canvas, int x, int y, SkPath::FillType ft,
                   SkScalar scale, const SkPaint& paint) {
-
         const SkRect r = { 0, 0, SkIntToScalar(150), SkIntToScalar(150) };
 
         canvas->save();
         canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
         canvas->clipRect(r);
         canvas->drawColor(SK_ColorWHITE);
         fPath.setFillType(ft);
         canvas->translate(r.centerX(), r.centerY());
         canvas->scale(scale, scale);
         canvas->translate(-r.centerX(), -r.centerY());
         canvas->drawPath(fPath, paint);
         canvas->restore();
     }
 
     void showFour(SkCanvas* canvas, SkScalar scale, const SkPaint& paint) {
         showPath(canvas,   0,   0, SkPath::kWinding_FillType,
                  scale, paint);
         showPath(canvas, 200,   0, SkPath::kEvenOdd_FillType,
                  scale, paint);
         showPath(canvas,  00, 200, SkPath::kInverseWinding_FillType,
                  scale, paint);
         showPath(canvas, 200, 200, SkPath::kInverseEvenOdd_FillType,
                  scale, paint);
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
+    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         this->makePath();
 
         canvas->translate(SkIntToScalar(20), SkIntToScalar(20));
 
         SkPaint paint;
         const SkScalar scale = SkIntToScalar(5)/4;
 
         paint.setAntiAlias(false);
 
         showFour(canvas, SK_Scalar1, paint);
@@ skipping 11 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new FillTypeGM; }
 static GMRegistry reg(MyFactory);
 
 }