Fix up all the easy virtual ... SK_OVERRIDE cases.

gm/glyph_pos.cpp

 /*
  * Copyright 2014 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 "SkTypeface.h"
 
 /* This test tries to define the effect of using hairline strokes on text.
  * Provides non-hairline images for reference and consistency checks.
  * glyph_pos_(h/n)_(s/f/b)
  *   -> test hairline/non-hairline stroke/fill/stroke+fill.
  */
 static const SkScalar kTextHeight = 14.0f;
 static const char kText[] = "Proportional Hamburgefons #% fi";
 
 namespace skiagm {
 
 class GlyphPosGM : public GM {
 public:
     GlyphPosGM(SkScalar strokeWidth, SkPaint::Style strokeStyle)
         : fStrokeWidth(strokeWidth)
         , fStrokeStyle(strokeStyle) {
         }
 
 protected:
-    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+    uint32_t onGetFlags() const SK_OVERRIDE {
         return kSkipTiled_Flag;
     }
 
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         SkString str("glyph_pos");
         if (fStrokeWidth == 0.0f) {
             str.append("_h"); // h == Hairline.
         } else {
             str.append("_n"); // n == Normal.
         }
         if (fStrokeStyle == SkPaint::kStroke_Style) {
             str.append("_s");
         } else if (fStrokeStyle == SkPaint::kFill_Style) {
             str.append("_f");
         } else {
             str.append("_b"); // b == Both.
         }
         return str;
     }
 
-    virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 600); }
+    SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 600); }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         if (!fProp) {
             fProp.reset(sk_tool_utils::create_portable_typeface("Helvetica", SkTypeface::kNormal));
         }
 
         // There's a black pixel at 40, 40 for reference.
         canvas->drawPoint(40.0f, 40.0f, SK_ColorBLACK);
 
         // Two reference images.
         canvas->translate(50.0f, 50.0f);
         drawTestCase(canvas, 1.0f);
@@ skipping 131 matching lines @@
 
 static GMRegistry reg1(GlyphPosHairlineStrokeAndFillFactory);
 static GMRegistry reg2(GlyphPosStrokeAndFillFactory);
 static GMRegistry reg3(GlyphPosHairlineStrokeFactory);
 static GMRegistry reg4(GlyphPosStrokeFactory);
 static GMRegistry reg5(GlyphPosHairlineFillFactory);
 static GMRegistry reg6(GlyphPosFillFactory);
 
 
 }