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

gm/bitmaprect.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 "SkGradientShader.h"
@@ skipping 17 matching lines @@
     canvas.drawCircle(32, 32, 32, paint);
 }
 
 class DrawBitmapRect2 : public skiagm::GM {
     bool fUseIRect;
 public:
     DrawBitmapRect2(bool useIRect) : fUseIRect(useIRect) {
     }
 
 protected:
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         SkString str;
         str.printf("bitmaprect_%s", fUseIRect ? "i" : "s");
         return str;
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(640, 480);
     }
 
 #ifdef SK_CPU_ARM64
     // Skip tiled drawing on 64-bit ARM until https://skbug.com/2908 is fixed.
-    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+    uint32_t onGetFlags() const SK_OVERRIDE {
         return kSkipTiled_Flag;
     }
 #endif
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         canvas->drawColor(0xFFCCCCCC);
 
         const SkIRect src[] = {
             { 0, 0, 32, 32 },
             { 0, 0, 80, 80 },
             { 32, 32, 96, 96 },
             { -32, -32, 32, 32, }
         };
 
         SkPaint paint;
@@ skipping 55 matching lines @@
 //                           |    |
 //                         __|____|__
 //                           |    |
 class DrawBitmapRect3 : public skiagm::GM {
 public:
     DrawBitmapRect3() {
         this->setBGColor(SK_ColorBLACK);
     }
 
 protected:
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         SkString str;
         str.printf("3x3bitmaprect");
         return str;
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(640, 480);
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
 
         SkBitmap bitmap;
         make_3x3_bitmap(&bitmap);
 
         SkRect srcR = { 0.5f, 0.5f, 2.5f, 2.5f };
         SkRect dstR = { 100, 100, 300, 200 };
 
         canvas->drawBitmapRectToRect(bitmap, &srcR, dstR, NULL);
     }
 
@@ skipping 28 matching lines @@
 class DrawBitmapRect4 : public skiagm::GM {
     bool fUseIRect;
     SkBitmap fBigBitmap;
 
 public:
     DrawBitmapRect4(bool useIRect) : fUseIRect(useIRect) {
         this->setBGColor(0x88444444);
     }
 
 protected:
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         SkString str;
         str.printf("bigbitmaprect_%s", fUseIRect ? "i" : "s");
         return str;
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(640, 480);
     }
 
-    virtual void onOnceBeforeDraw() SK_OVERRIDE {
+    void onOnceBeforeDraw() SK_OVERRIDE {
         make_big_bitmap(&fBigBitmap);
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
 
         SkXfermode* mode = SkXfermode::Create(SkXfermode::kXor_Mode);
 
         SkPaint paint;
         paint.setAlpha(128);
         paint.setXfermode(mode)->unref();
 
         SkRect srcR1 = { 0.0f, 0.0f, 4096.0f, 2040.0f };
         SkRect dstR1 = { 10.1f, 10.1f, 629.9f, 400.9f };
 
@@ skipping 77 matching lines @@
 static skiagm::GMRegistry reg0(MyFactory0);
 static skiagm::GMRegistry reg1(MyFactory1);
 
 static skiagm::GMRegistry reg2(MyFactory2);
 
 #ifndef SK_BUILD_FOR_ANDROID
 static skiagm::GMRegistry reg3(MyFactory3);
 static skiagm::GMRegistry reg4(MyFactory4);
 #endif