Cleanup: More override fixes - another round.

gm/filltypespersp.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"
 #include "SkGradientShader.h"
 
@@ skipping 10 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("filltypespersp");
     }
 
-    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, bool aa) {
-
         SkPaint paint;
         SkPoint center = SkPoint::Make(SkIntToScalar(100), SkIntToScalar(100));
         SkColor colors[] = {SK_ColorBLUE, SK_ColorRED, SK_ColorGREEN};
         SkScalar pos[] = {0, SK_ScalarHalf, SK_Scalar1};
         SkShader* s = SkGradientShader::CreateRadial(center,
                                                      SkIntToScalar(100),
                                                      colors,
                                                      pos,
                                                      SK_ARRAY_COUNT(colors),
                                                      SkShader::kClamp_TileMode);
         paint.setShader(s)->unref();
         paint.setAntiAlias(aa);
 
         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();
 
         // do perspective drawPaint as the background;
         SkPaint bkgnrd;
         SkPoint center = SkPoint::Make(SkIntToScalar(100),
                                        SkIntToScalar(100));
         SkColor colors[] = {SK_ColorBLACK, SK_ColorCYAN,
                             SK_ColorYELLOW, SK_ColorWHITE};
         SkScalar pos[] = {0, SK_ScalarHalf / 2,
                           3 * SK_ScalarHalf / 2, SK_Scalar1};
@@ skipping 36 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new FillTypePerspGM; }
 static GMRegistry reg(MyFactory);
 
 }