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

bench/ETCBitmapBench.cpp

 /*
  * Copyright 2014 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 "Resources.h"
 #include "SkCanvas.h"
@@ skipping 104 matching lines @@
     typedef Benchmark INHERITED;
 };
 
 // This is the rendering benchmark. Prior to rendering the data, create a
 // bitmap using the etc1 data.
 class ETCBitmapBench : public ETCBitmapBenchBase {
 public:
     ETCBitmapBench(bool decompress, Backend backend)
         : fDecompress(decompress), fBackend(backend) { }
 
-    virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
+    bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == this->fBackend;
     }
 
 protected:
-    virtual const char* onGetName() SK_OVERRIDE {
+    const char* onGetName() SK_OVERRIDE {
         if (kGPU_Backend == this->fBackend) {
             if (this->fDecompress) {
                 return "etc1bitmap_render_gpu_decompressed";
             } else {
                 return "etc1bitmap_render_gpu_compressed";
             }
         } else {
             SkASSERT(kRaster_Backend == this->fBackend);
             if (this->fDecompress) {
                 return "etc1bitmap_render_raster_decompressed";
             } else {
                 return "etc1bitmap_render_raster_compressed";
             }
         }
     }
 
-    virtual void onPreDraw() SK_OVERRIDE {
+    void onPreDraw() SK_OVERRIDE {
         if (NULL == fPKMData) {
             SkDebugf("Failed to load PKM data!\n");
             return;
         }
 
         // Install pixel ref
         if (!SkInstallDiscardablePixelRef(fPKMData, &(this->fBitmap))) {
             SkDebugf("Could not install discardable pixel ref.\n");
             return;
         }
 
         // Decompress it if necessary
         if (this->fDecompress) {
             this->fBitmap.lockPixels();
         }
     }
 
-    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         for (int i = 0; i < loops; ++i) {
             canvas->drawBitmap(this->fBitmap, 0, 0, NULL);
         }
     }
 
 protected:
     SkBitmap fBitmap;
     bool decompress() const { return fDecompress; }
     Backend backend() const { return fBackend; }
 private:
     const bool fDecompress;
     const Backend fBackend;
     typedef ETCBitmapBenchBase INHERITED;
 };
 
 // This benchmark is identical to the previous benchmark, but it explicitly forces
 // an upload to the GPU before each draw call. We do this by notifying the bitmap
 // that the pixels have changed (even though they haven't).
 class ETCBitmapUploadBench : public ETCBitmapBench {
 public:
     ETCBitmapUploadBench(bool decompress, Backend backend)
         : ETCBitmapBench(decompress, backend) { }
 
 protected:
-    virtual const char* onGetName() SK_OVERRIDE {
+    const char* onGetName() SK_OVERRIDE {
         if (kGPU_Backend == this->backend()) {
             if (this->decompress()) {
                 return "etc1bitmap_upload_gpu_decompressed";
             } else {
                 return "etc1bitmap_upload_gpu_compressed";
             }
         } else {
             SkASSERT(kRaster_Backend == this->backend());
             if (this->decompress()) {
                 return "etc1bitmap_upload_raster_decompressed";
             } else {
                 return "etc1bitmap_upload_raster_compressed";
             }
         }
     }
 
-    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkPixelRef* pr = fBitmap.pixelRef();
         for (int i = 0; i < loops; ++i) {
             if (pr) {
                 pr->notifyPixelsChanged();
             }
             canvas->drawBitmap(this->fBitmap, 0, 0, NULL);
         }
     }
 
 private:
     typedef ETCBitmapBench INHERITED;
 };
 
 DEF_BENCH(return new ETCBitmapBench(false, Benchmark::kRaster_Backend);)
 DEF_BENCH(return new ETCBitmapBench(true, Benchmark::kRaster_Backend);)
 
 DEF_BENCH(return new ETCBitmapBench(false, Benchmark::kGPU_Backend);)
 DEF_BENCH(return new ETCBitmapBench(true, Benchmark::kGPU_Backend);)
 
 DEF_BENCH(return new ETCBitmapUploadBench(false, Benchmark::kRaster_Backend);)
 DEF_BENCH(return new ETCBitmapUploadBench(true, Benchmark::kRaster_Backend);)
 
 DEF_BENCH(return new ETCBitmapUploadBench(false, Benchmark::kGPU_Backend);)
 DEF_BENCH(return new ETCBitmapUploadBench(true, Benchmark::kGPU_Backend);)
 
 #endif  // SK_IGNORE_ETC1_SUPPORT