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

bench/BitmapBench.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 229 matching lines @@
             const SkScalar x = SkIntToScalar(dim.fWidth) / 2;
             const SkScalar y = SkIntToScalar(dim.fHeight) / 2;
 
             canvas->translate(x, y);
             canvas->rotate(SkIntToScalar(35));
             canvas->translate(-x, -y);
         }
         INHERITED::onDraw(loops, canvas);
     }
 
-    virtual void setupPaint(SkPaint* paint) SK_OVERRIDE {
+    void setupPaint(SkPaint* paint) SK_OVERRIDE {
         this->INHERITED::setupPaint(paint);
 
         int index = 0;
         if (fFlags & kBilerp_Flag) {
             index |= 1;
         }
         if (fFlags & kBicubic_Flag) {
             index |= 2;
         }
         static const SkPaint::FilterLevel gLevels[] = {
@@ skipping 35 matching lines @@
                 fFullName.append("_source_transparent");
         } else if (fSourceAlpha == kTwoStripes_SourceAlpha) {
                 fFullName.append("_source_stripes_two");
         } else if (fSourceAlpha == kThreeStripes_SourceAlpha) {
                 fFullName.append("_source_stripes_three");
         }
 
         return fFullName.c_str();
     }
 
-    virtual void onDrawIntoBitmap(const SkBitmap& bm) SK_OVERRIDE {
+    void onDrawIntoBitmap(const SkBitmap& bm) SK_OVERRIDE {
         const int w = bm.width();
         const int h = bm.height();
 
         if (kOpaque_SourceAlpha == fSourceAlpha) {
             bm.eraseColor(SK_ColorBLACK);
         } else if (kTransparent_SourceAlpha == fSourceAlpha) {
             bm.eraseColor(0);
         } else if (kTwoStripes_SourceAlpha == fSourceAlpha) {
             bm.eraseColor(0);
 
@@ skipping 64 matching lines @@
 DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, false, kScale_Flag | kRotate_Flag | kBilerp_Flag); )
 
 DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, false, kScale_Flag | kBilerp_Flag | kBicubic_Flag); )
 DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, false, kScale_Flag | kRotate_Flag | kBilerp_Flag | kBicubic_Flag); )
 
 // source alpha tests -> S32A_Opaque_BlitRow32_{arm,neon}
 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kOpaque_SourceAlpha, kN32_SkColorType); )
 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kTransparent_SourceAlpha, kN32_SkColorType); )
 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kTwoStripes_SourceAlpha, kN32_SkColorType); )
 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kThreeStripes_SourceAlpha, kN32_SkColorType); )