Cleanup: Another round of override fixes.

gm/verttext.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"
@@ skipping 35 matching lines @@
     {
     }
 
     //SkAutoTUnref<SkTypeface> fFace;
 
 protected:
     virtual uint32_t onGetFlags() const SK_OVERRIDE {
         return kSkipTiled_Flag;
     }
 
-    SkString onShortName() {
+    SkString onShortName() SK_OVERRIDE {
         return SkString("verttext");
     }
 
-    SkISize onISize() { return SkISize::Make(640, 480); }
+    SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); }
 
     static void drawBaseline(SkCanvas* canvas, const SkPaint& paint,
                              SkScalar x, SkScalar y) {
         SkScalar total = paint.measureText(gText, gLen);
 
         SkPaint p;
         p.setAntiAlias(true);
         p.setColor(0x80FF0000);
         canvas->drawLine(x, y,
                          paint.isVerticalText() ? x : x + total,
                          paint.isVerticalText() ? y + total : y,
                          p);
 
         p.setColor(0xFF0000FF);
         SkScalar adv[gLen];
         int numChars = paint.getTextWidths(gText, gLen, adv, NULL);
         for (int i = 0; i < numChars; ++i) {
             canvas->drawCircle(x, y, SK_Scalar1 * 3 / 2, p);
             if (paint.isVerticalText()) {
                 y += adv[i];
             } else {
                 x += adv[i];
             }
         }
         canvas->drawCircle(x, y, SK_Scalar1 * 3 / 2, p);
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
+    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkScalar x = SkIntToScalar(100);
         SkScalar y = SkIntToScalar(50);
 
         for (int i = 0; i < 4; ++i) {
             SkPaint paint;
             paint.setAntiAlias(true);
             paint.setTextSize(SkIntToScalar(TEXT_SIZE));
             //paint.setTypeface(fFace);
             //paint.setFakeBoldText(true);
 
@@ skipping 15 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new VertTextGM; }
 static GMRegistry reg(MyFactory);
 
 }