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

gm/xfermodeimagefilter.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 "SkArithmeticMode.h"
 #include "SkOffsetImageFilter.h"
 #include "SkXfermodeImageFilter.h"
 #include "SkBitmapSource.h"
 
 #define WIDTH 600
 #define HEIGHT 600
 #define MARGIN 12
 
 namespace skiagm {
 
 class XfermodeImageFilterGM : public GM {
 public:
     XfermodeImageFilterGM(){
         this->setBGColor(0xFF000000);
     }
 
 protected:
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         return SkString("xfermodeimagefilter");
     }
 
     void make_bitmap() {
         fBitmap.allocN32Pixels(80, 80);
         SkCanvas canvas(fBitmap);
         canvas.clear(0x00000000);
         SkPaint paint;
         paint.setAntiAlias(true);
         sk_tool_utils::set_portable_typeface(&paint);
@@ skipping 17 matching lines @@
             canvas.translate(SkIntToScalar(x), SkIntToScalar(y));
             canvas.drawRect(SkRect::MakeXYWH(0, 0, 8, 8), darkPaint);
             canvas.drawRect(SkRect::MakeXYWH(8, 0, 8, 8), lightPaint);
             canvas.drawRect(SkRect::MakeXYWH(0, 8, 8, 8), lightPaint);
             canvas.drawRect(SkRect::MakeXYWH(8, 8, 8, 8), darkPaint);
             canvas.restore();
           }
         }
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(WIDTH, HEIGHT);
     }
 
     static void drawClippedBitmap(SkCanvas* canvas, const SkBitmap& bitmap, const SkPaint& paint,
                            int x, int y) {
         canvas->save();
         canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
         canvas->clipRect(SkRect::MakeWH(
             SkIntToScalar(bitmap.width()), SkIntToScalar(bitmap.height())));
         canvas->drawBitmap(bitmap, 0, 0, &paint);
         canvas->restore();
     }
 
     static void drawClippedPaint(SkCanvas* canvas, const SkRect& rect, const SkPaint& paint,
                           int x, int y) {
         canvas->save();
         canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
         canvas->clipRect(rect);
         canvas->drawPaint(paint);
         canvas->restore();
     }
 
-    virtual void onOnceBeforeDraw() SK_OVERRIDE {
+    void onOnceBeforeDraw() SK_OVERRIDE {
         make_bitmap();
         make_checkerboard();
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         canvas->clear(0x00000000);
         SkPaint paint;
 
         const struct {
             SkXfermode::Mode  fMode;
             const char*         fLabel;
         } gModes[] = {
             { SkXfermode::kClear_Mode,    "Clear"     },
             { SkXfermode::kSrc_Mode,      "Src"       },
             { SkXfermode::kDst_Mode,      "Dst"       },
@@ skipping 114 matching lines @@
 private:
     SkBitmap fBitmap, fCheckerboard;
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new XfermodeImageFilterGM; );
 
 }