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

gm/bitmapscroll.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"
 
 namespace skiagm {
@@ skipping 41 matching lines @@
         make_bitmap(quarterWidth, quarterHeight, &origBitmap);
     }
 
 public:
     BitmapScrollGM() {
         fInited = false;
         this->setBGColor(0xFFDDDDDD);
     }
 
 protected:
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         return SkString("bitmapscroll");
     }
 
-    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+    uint32_t onGetFlags() const SK_OVERRIDE {
         return kSkipTiled_Flag;
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
       return SkISize::Make(800, 600);
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         this->init();
         SkIRect scrollCenterRegion = SkIRect::MakeXYWH(
             quarterWidth, quarterHeight, quarterWidth*2+1, quarterHeight*2+1);
         int x = quarterWidth;
         int y = quarterHeight;
         int xSpacing = quarterWidth * 20;
         int ySpacing = quarterHeight * 16;
 
         // Draw left-hand text labels.
         drawLabel(canvas, "scroll entire bitmap",
@@ skipping 65 matching lines @@
     static const int quarterHeight = 14;
     SkBitmap origBitmap;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new BitmapScrollGM; }
 static GMRegistry reg(MyFactory);
 
 }