Cleanup: More override fixes - another round.

gm/giantbitmap.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 "SkCanvas.h"
 #include "SkColorPriv.h"
@@ skipping 64 matching lines @@
 #ifdef SK_BUILD_FOR_ANDROID
         return kSkipTiled_Flag;
 #else
         if (fDoFilter && fDoRotate && fMode != SkShader::kClamp_TileMode) {
             return kSkipTiled_Flag;
         }
         return 0;
 #endif
     }
 
-    virtual SkString onShortName() {
+    virtual SkString onShortName() SK_OVERRIDE {
         SkString str("giantbitmap_");
         switch (fMode) {
             case SkShader::kClamp_TileMode:
                 str.append("clamp");
                 break;
             case SkShader::kRepeat_TileMode:
                 str.append("repeat");
                 break;
             case SkShader::kMirror_TileMode:
                 str.append("mirror");
                 break;
             default:
                 break;
         }
         str.append(fDoFilter ? "_bilerp" : "_point");
         str.append(fDoRotate ? "_rotate" : "_scale");
         return str;
     }
 
-    virtual SkISize onISize() { return SkISize::Make(640, 480); }
+    virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); }
 
-    virtual void onDraw(SkCanvas* canvas) {
+    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
 
         SkMatrix m;
         if (fDoRotate) {
 //            m.setRotate(SkIntToScalar(30), 0, 0);
             m.setSkew(SK_Scalar1, 0, 0, 0);
 //            m.postScale(2*SK_Scalar1/3, 2*SK_Scalar1/3);
         } else {
             SkScalar scale = 11*SK_Scalar1/12;
             m.setScale(scale, scale);
@@ skipping 36 matching lines @@
 static skiagm::GMRegistry reg010(G010);
 static skiagm::GMRegistry reg110(G110);
 static skiagm::GMRegistry reg210(G210);
 
 static skiagm::GMRegistry reg001(G001);
 static skiagm::GMRegistry reg101(G101);
 static skiagm::GMRegistry reg201(G201);
 static skiagm::GMRegistry reg011(G011);
 static skiagm::GMRegistry reg111(G111);
 static skiagm::GMRegistry reg211(G211);