Cleanup: More override fixes - another round.

gm/fontmgr.cpp

 /*
  * Copyright 2013 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 "SkFontMgr.h"
@@ skipping 50 matching lines @@
         fName.set("fontmgr_iter");
         if (fontMgr) {
             fName.append("_factory");
             fFM.reset(fontMgr);
         } else {
             fFM.reset(SkFontMgr::RefDefault());
         }
     }
 
 protected:
-    virtual SkString onShortName() {
+    virtual SkString onShortName() SK_OVERRIDE {
         return fName;
     }
 
-    virtual SkISize onISize() {
+    virtual SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(1536, 768);
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkScalar y = 20;
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setLCDRenderText(true);
         paint.setSubpixelText(true);
         paint.setTextSize(17);
@@ skipping 47 matching lines @@
 
 class FontMgrMatchGM : public skiagm::GM {
     SkAutoTUnref<SkFontMgr> fFM;
 
 public:
     FontMgrMatchGM() : fFM(SkFontMgr::RefDefault()) {
         SkGraphics::SetFontCacheLimit(16 * 1024 * 1024);
     }
 
 protected:
-    virtual SkString onShortName() {
+    virtual SkString onShortName() SK_OVERRIDE {
         return SkString("fontmgr_match");
     }
 
-    virtual SkISize onISize() {
+    virtual SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(640, 1024);
     }
 
     void iterateFamily(SkCanvas* canvas, const SkPaint& paint,
                        SkFontStyleSet* fset) {
         SkPaint p(paint);
         SkScalar y = 0;
 
         for (int j = 0; j < fset->count(); ++j) {
             SkString sname;
@@ skipping 79 matching lines @@
         fFM.reset(SkFontMgr::RefDefault());
     }
 
     static void show_bounds(SkCanvas* canvas, const SkPaint& paint, SkScalar x, SkScalar y,
                             SkColor boundsColor) {
         const char str[] = "jyHO[]{}@-_&%$";
 
         for (int i = 0; str[i]; ++i) {
             canvas->drawText(&str[i], 1, x, y, paint);
         }
-        
+
         SkRect r = paint.getFontBounds();
         r.offset(x, y);
         SkPaint p(paint);
         p.setColor(boundsColor);
         canvas->drawRect(r, p);
     }
 
 protected:
-    virtual SkString onShortName() {
+    virtual SkString onShortName() SK_OVERRIDE {
         return fName;
     }
-    
-    virtual SkISize onISize() {
+
+    virtual SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(1024, 850);
     }
-    
+
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setSubpixelText(true);
         paint.setTextSize(100);
         paint.setStyle(SkPaint::kStroke_Style);
         paint.setTextScaleX(fScaleX);
         paint.setTextSkewX(fSkewX);
 
         const SkColor boundsColors[2] = { SK_ColorRED, SK_ColorBLUE };
@@ skipping 47 matching lines @@
 
 DEF_GM( return SkNEW(FontMgrGM); )
 DEF_GM( return SkNEW(FontMgrMatchGM); )
 DEF_GM( return SkNEW(FontMgrBoundsGM(1.0, 0)); )
 DEF_GM( return SkNEW(FontMgrBoundsGM(0.75, 0)); )
 DEF_GM( return SkNEW(FontMgrBoundsGM(1.0, -0.25)); )
 
 #ifdef SK_BUILD_FOR_WIN
     DEF_GM( return SkNEW_ARGS(FontMgrGM, (SkFontMgr_New_DirectWrite())); )
 #endif