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

bench/BitmapRectBench.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 "Benchmark.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 41 matching lines @@
     BitmapRectBench(U8CPU alpha, SkPaint::FilterLevel filterLevel,
                     bool slightMatrix)  {
         fAlpha = SkToU8(alpha);
         fFilterLevel = filterLevel;
         fSlightMatrix = slightMatrix;
 
         fBitmap.setInfo(SkImageInfo::MakeN32Premul(kWidth, kHeight));
     }
 
 protected:
-    virtual const char* onGetName() SK_OVERRIDE {
+    const char* onGetName() SK_OVERRIDE {
         fName.printf("bitmaprect_%02X_%sfilter_%s",
                      fAlpha,
                      SkPaint::kNone_FilterLevel == fFilterLevel ? "no" : "",
                      fSlightMatrix ? "trans" : "identity");
         return fName.c_str();
     }
 
-    virtual void onPreDraw() SK_OVERRIDE {
+    void onPreDraw() SK_OVERRIDE {
         fBitmap.allocPixels();
         fBitmap.setAlphaType(kOpaque_SkAlphaType);
         fBitmap.eraseColor(SK_ColorBLACK);
         draw_into_bitmap(fBitmap);
 
         fSrcR.iset(0, 0, kWidth, kHeight);
         fDstR.iset(0, 0, kWidth, kHeight);
 
         if (fSlightMatrix) {
             // want fractional translate
             fDstR.offset(SK_Scalar1 / 3, SK_Scalar1 * 5 / 7);
             // want enough to create a scale matrix, but not enough to scare
             // off our sniffer which tries to see if the matrix is "effectively"
             // translate-only.
             fDstR.fRight += SK_Scalar1 / (kWidth * 60);
         }
     }
 
 
-    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkRandom rand;
 
         SkPaint paint;
         this->setupPaint(&paint);
         paint.setFilterLevel(fFilterLevel);
         paint.setAlpha(fAlpha);
 
         for (int i = 0; i < loops; i++) {
             canvas->drawBitmapRectToRect(fBitmap, &fSrcR, fDstR, &paint);
         }
     }
 
 private:
     typedef Benchmark INHERITED;
 };
 
 DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kNone_FilterLevel, false))
 DEF_BENCH(return new BitmapRectBench(0x80, SkPaint::kNone_FilterLevel, false))
 DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kLow_FilterLevel, false))
 DEF_BENCH(return new BitmapRectBench(0x80, SkPaint::kLow_FilterLevel, false))
 
 DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kNone_FilterLevel, true))
 DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kLow_FilterLevel, true))