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

bench/BlurRectBench.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 "Benchmark.h"
 #include "SkBlurMask.h"
 #include "SkCanvas.h"
@@ skipping 70 matching lines @@
 
         if (SkScalarFraction(rad) != 0) {
             name.printf("blurrect_direct_%.2f", SkScalarToFloat(rad));
         } else {
             name.printf("blurrect_direct_%d", SkScalarRoundToInt(rad));
         }
 
         this->setName(name);
     }
 protected:
-    virtual void makeBlurryRect(const SkRect& r) SK_OVERRIDE {
+    void makeBlurryRect(const SkRect& r) SK_OVERRIDE {
         SkMask mask;
         SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(this->radius()),
                              &mask, r, kNormal_SkBlurStyle);
         SkMask::FreeImage(mask.fImage);
     }
 private:
     typedef BlurRectBench INHERITED;
 };
 
 class BlurRectSeparableBench: public BlurRectBench {
 
 public:
     BlurRectSeparableBench(SkScalar rad) : INHERITED(rad) {
         fSrcMask.fImage = NULL;
     }
 
     ~BlurRectSeparableBench() {
         SkMask::FreeImage(fSrcMask.fImage);
     }
 
 protected:
-    virtual void preBenchSetup(const SkRect& r) SK_OVERRIDE {
+    void preBenchSetup(const SkRect& r) SK_OVERRIDE {
         SkMask::FreeImage(fSrcMask.fImage);
 
         r.roundOut(&fSrcMask.fBounds);
         fSrcMask.fFormat = SkMask::kA8_Format;
         fSrcMask.fRowBytes = fSrcMask.fBounds.width();
         fSrcMask.fImage = SkMask::AllocImage(fSrcMask.computeTotalImageSize());
 
         memset(fSrcMask.fImage, 0xff, fSrcMask.computeTotalImageSize());
     }
 
@@ skipping 11 matching lines @@
             name.printf("blurrect_boxfilter_%.2f", SkScalarToFloat(rad));
         } else {
             name.printf("blurrect_boxfilter_%d", SkScalarRoundToInt(rad));
         }
 
         this->setName(name);
     }
 
 protected:
 
-    virtual void makeBlurryRect(const SkRect&) SK_OVERRIDE {
+    void makeBlurryRect(const SkRect&) SK_OVERRIDE {
         SkMask mask;
         mask.fImage = NULL;
         SkBlurMask::BoxBlur(&mask, fSrcMask, SkBlurMask::ConvertRadiusToSigma(this->radius()),
                             kNormal_SkBlurStyle, kHigh_SkBlurQuality);
         SkMask::FreeImage(mask.fImage);
     }
 private:
     typedef BlurRectSeparableBench INHERITED;
 };
 
 class BlurRectGaussianBench: public BlurRectSeparableBench {
 public:
     BlurRectGaussianBench(SkScalar rad) : INHERITED(rad) {
         SkString name;
 
         if (SkScalarFraction(rad) != 0) {
             name.printf("blurrect_gaussian_%.2f", SkScalarToFloat(rad));
         } else {
             name.printf("blurrect_gaussian_%d", SkScalarRoundToInt(rad));
         }
 
         this->setName(name);
     }
 
 protected:
 
-    virtual void makeBlurryRect(const SkRect&) SK_OVERRIDE {
+    void makeBlurryRect(const SkRect&) SK_OVERRIDE {
         SkMask mask;
         mask.fImage = NULL;
         SkBlurMask::BlurGroundTruth(SkBlurMask::ConvertRadiusToSigma(this->radius()),
                                     &mask, fSrcMask, kNormal_SkBlurStyle);
         SkMask::FreeImage(mask.fImage);
     }
 private:
     typedef BlurRectSeparableBench INHERITED;
 };
 
@@ skipping 36 matching lines @@
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(12));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(13));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(14));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(15));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(16));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(17));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(18));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(19));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(20));)
 #endif