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

gm/variedtext.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 "SkPath.h"
@@ skipping 13 matching lines @@
         memset(fTypefacesToUnref, 0, sizeof(fTypefacesToUnref));
     }
 
     ~VariedTextGM() {
         for (size_t i = 0; i < SK_ARRAY_COUNT(fTypefacesToUnref); ++i) {
             SkSafeUnref(fTypefacesToUnref[i]);
         }
     }
 
 protected:
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         SkString name("varied_text");
         if (fEffectiveClip) {
             name.append("_clipped");
         } else {
             name.append("_ignorable_clip");
         }
         if (fLCD) {
             name.append("_lcd");
         } else {
             name.append("_no_lcd");
         }
         return name;
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(640, 480);
     }
 
-    virtual void onOnceBeforeDraw() SK_OVERRIDE {
+    void onOnceBeforeDraw() SK_OVERRIDE {
         fPaint.setAntiAlias(true);
         fPaint.setLCDRenderText(fLCD);
 
         SkISize size = this->getISize();
         SkScalar w = SkIntToScalar(size.fWidth);
         SkScalar h = SkIntToScalar(size.fHeight);
 
         SK_COMPILE_ASSERT(4 == SK_ARRAY_COUNT(fTypefacesToUnref), typeface_cnt);
         fTypefacesToUnref[0] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kNormal);
         fTypefacesToUnref[1] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kBold);
@@ skipping 40 matching lines @@
             fClipRects[i] = r;
             fClipRects[i].offset(fPositions[i].fX, fPositions[i].fY);
             fClipRects[i].outset(2.f, 2.f);
 
             if (fEffectiveClip) {
                 fClipRects[i].fRight -= 0.25f * fClipRects[i].width();
             }
         }
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         for (int i = 0; i < kCnt; ++i) {
             fPaint.setColor(fColors[i]);
             fPaint.setTextSize(fPtSizes[i]);
             fPaint.setTypeface(fTypefaces[i]);
 
             canvas->save();
                 canvas->clipRect(fClipRects[i]);
                 canvas->translate(fPositions[i].fX, fPositions[i].fY);
                 canvas->drawText(fStrings[i].c_str(), fStrings[i].size(), 0, 0, fPaint);
             canvas->restore();
         }
 
         // Visualize the clips, but not in bench mode.
         if (kBench_Mode != this->getMode()) {
             SkPaint wirePaint;
             wirePaint.setAntiAlias(true);
             wirePaint.setStrokeWidth(0);
             wirePaint.setStyle(SkPaint::kStroke_Style);
             for (int i = 0; i < kCnt; ++i) {
                 canvas->drawRect(fClipRects[i], wirePaint);
             }
         }
     }
 
-    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+    uint32_t onGetFlags() const SK_OVERRIDE {
         // The aa hairline stroked rects used to visualize the clip draw slightly differently in
         // quilt mode in dm.
         return kAsBench_Flag | kSkipTiled_Flag;
     }
 
 private:
     static const int kCnt = 30;
     static const int kMinLength = 15;
     static const int kMaxLength = 40;
 
@@ skipping 10 matching lines @@
     SkPoint         fPositions[kCnt];
     SkRect          fClipRects[kCnt];
 
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM( return SkNEW(VariedTextGM(false, false)); )
 DEF_GM( return SkNEW(VariedTextGM(true, false)); )
 DEF_GM( return SkNEW(VariedTextGM(false, true)); )
 DEF_GM( return SkNEW(VariedTextGM(true, true)); )