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

gm/aaclip.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 "SkPath.h"
@@ skipping 53 matching lines @@
    border, with no red.
 */
 
 class AAClipGM : public skiagm::GM {
 public:
     AAClipGM() {
 
     }
 
 protected:
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         return SkString("aaclip");
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(240, 120);
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         // Initial pixel-boundary-aligned draw
         draw_rect_tests(canvas);
 
         // Repeat 4x with .2, .4, .6, .8 px offsets
         canvas->translate(SK_Scalar1 / 5, SK_Scalar1 / 5);
         canvas->translate(SkIntToScalar(50), 0);
         draw_rect_tests(canvas);
 
         canvas->translate(SK_Scalar1 / 5, SK_Scalar1 / 5);
         canvas->translate(SkIntToScalar(50), 0);
         draw_rect_tests(canvas);
 
         canvas->translate(SK_Scalar1 / 5, SK_Scalar1 / 5);
         canvas->translate(SkIntToScalar(50), 0);
         draw_rect_tests(canvas);
 
         canvas->translate(SK_Scalar1 / 5, SK_Scalar1 / 5);
         canvas->translate(SkIntToScalar(50), 0);
         draw_rect_tests(canvas);
     }
 
-    virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; }
+    uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM( return SkNEW(AAClipGM); )
 
 /////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_BUILD_FOR_MAC
@@ skipping 34 matching lines @@
     CGImageRelease(image);
 
     canvas->drawBitmap(bm2, 10, 120);
 }
 
 class CGImageGM : public skiagm::GM {
 public:
     CGImageGM() {}
 
 protected:
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         return SkString("cgimage");
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(800, 250);
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         const struct {
             SkColorType fCT;
             SkAlphaType fAT;
         } rec[] = {
             { kRGB_565_SkColorType, kOpaque_SkAlphaType },
 
             { kRGBA_8888_SkColorType, kPremul_SkAlphaType },
             { kRGBA_8888_SkColorType, kUnpremul_SkAlphaType },
             { kRGBA_8888_SkColorType, kOpaque_SkAlphaType },
 
             { kBGRA_8888_SkColorType, kPremul_SkAlphaType },
             { kBGRA_8888_SkColorType, kUnpremul_SkAlphaType },
             { kBGRA_8888_SkColorType, kOpaque_SkAlphaType },
         };
 
         for (size_t i = 0; i < SK_ARRAY_COUNT(rec); ++i) {
             SkImageInfo info = SkImageInfo::Make(100, 100, rec[i].fCT, rec[i].fAT);
             test_image(canvas, info);
             canvas->translate(info.width() + 10, 0);
         }
     }
 
-    virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; }
+    uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 #if 0 // Disabled pending fix from reed@
 DEF_GM( return SkNEW(CGImageGM); )
 #endif
 #endif