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

gm/mixedxfermodes.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 "SkBitmap.h"
 #include "SkRandom.h"
@@ skipping 13 matching lines @@
 protected:
     enum ShapeType {
         kShapeTypeCircle,
         kShapeTypeRoundRect,
         kShapeTypeRect,
         kShapeTypeConvexPath,
         kShapeTypeConcavePath,
         kNumShapeTypes
     };
 
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         return SkString("mixed_xfermodes");
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(790, 640);
     }
 
     void drawShape(SkCanvas* canvas,
                    const SkPaint& paint,
                    ShapeType type) {
         static const SkRect kRect = SkRect::MakeXYWH(SkIntToScalar(-50), SkIntToScalar(-50),
                                                      SkIntToScalar(75), SkIntToScalar(105));
         switch (type) {
             case kShapeTypeCircle:
@@ skipping 31 matching lines @@
                     fConcavePath.setFillType(SkPath::kEvenOdd_FillType);
                     SkASSERT(!fConcavePath.isConvex());
                 }
                 canvas->drawPath(fConcavePath, paint);
                 break;
             default:
                 break;
         }
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         if (NULL == fBG.get()) {
             static uint32_t kCheckerPixelData[] = { 0xFFFFFFFF,
                                                     0xFFCCCCCC,
                                                     0xFFCCCCCC,
                                                     0xFFFFFFFF };
             SkBitmap bitmap;
             bitmap.allocN32Pixels(2, 2);
             memcpy(bitmap.getPixels(), kCheckerPixelData, sizeof(kCheckerPixelData));
             SkMatrix lm;
             lm.setScale(SkIntToScalar(20), SkIntToScalar(20));
@@ skipping 77 matching lines @@
     SkPath                 fConvexPath;
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new MixedXfermodesGM; }
 static GMRegistry reg(MyFactory);
 
 }