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

bench/PicturePlaybackBench.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 "SkCanvas.h"
 #include "SkColor.h"
 #include "SkPaint.h"
@@ skipping 54 matching lines @@
     SkScalar fTextSize;
 private:
     typedef Benchmark INHERITED;
 };
 
 
 class TextPlaybackBench : public PicturePlaybackBench {
 public:
     TextPlaybackBench() : INHERITED("drawText") { }
 protected:
-    virtual void recordCanvas(SkCanvas* canvas) SK_OVERRIDE {
+    void recordCanvas(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         paint.setTextSize(fTextSize);
         paint.setColor(SK_ColorBLACK);
 
         const char* text = "Hamburgefons";
         size_t len = strlen(text);
         const SkScalar textWidth = paint.measureText(text, len);
 
         for (SkScalar x = 0; x < fPictureWidth; x += textWidth) {
             for (SkScalar y = 0; y < fPictureHeight; y += fTextSize) {
                 canvas->drawText(text, len, x, y, paint);
             }
         }
     }
 private:
     typedef PicturePlaybackBench INHERITED;
 };
 
 class PosTextPlaybackBench : public PicturePlaybackBench {
 public:
     PosTextPlaybackBench(bool drawPosH)
         : INHERITED(drawPosH ? "drawPosTextH" : "drawPosText")
         , fDrawPosH(drawPosH) { }
 protected:
-    virtual void recordCanvas(SkCanvas* canvas) SK_OVERRIDE {
+    void recordCanvas(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         paint.setTextSize(fTextSize);
         paint.setColor(SK_ColorBLACK);
 
         const char* text = "Hamburgefons";
         size_t len = strlen(text);
         const SkScalar textWidth = paint.measureText(text, len);
 
         SkScalar* adv = new SkScalar[len];
         paint.getTextWidths(text, len, adv);
@@ skipping 41 matching lines @@
         switch (fBBH) {
             case kNone:     fName.append("_none"    ); break;
             case kRTree:    fName.append("_rtree"   ); break;
         }
         switch (fMode) {
             case kTiled:  fName.append("_tiled" ); break;
             case kRandom: fName.append("_random"); break;
         }
     }
 
-    virtual const char* onGetName() SK_OVERRIDE { return fName.c_str(); }
-    virtual SkIPoint onGetSize() SK_OVERRIDE { return SkIPoint::Make(1024,1024); }
+    const char* onGetName() SK_OVERRIDE { return fName.c_str(); }
+    SkIPoint onGetSize() SK_OVERRIDE { return SkIPoint::Make(1024,1024); }
 
-    virtual void onPreDraw() SK_OVERRIDE {
+    void onPreDraw() SK_OVERRIDE {
         SkAutoTDelete<SkBBHFactory> factory;
         switch (fBBH) {
             case kNone:                                                 break;
             case kRTree:    factory.reset(new SkRTreeFactory);          break;
         }
 
         SkPictureRecorder recorder;
         SkCanvas* canvas = recorder.beginRecording(1024, 1024, factory);
             SkRandom rand;
             for (int i = 0; i < 10000; i++) {
                 SkScalar x = rand.nextRangeScalar(0, 1024),
                          y = rand.nextRangeScalar(0, 1024),
                          w = rand.nextRangeScalar(0, 128),
                          h = rand.nextRangeScalar(0, 128);
                 SkPaint paint;
                 paint.setColor(rand.nextU());
                 paint.setAlpha(0xFF);
                 canvas->drawRect(SkRect::MakeXYWH(x,y,w,h), paint);
             }
         fPic.reset(recorder.endRecording());
     }
 
-    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++) {
             // This inner loop guarantees we make the same choices for all bench variants.
             SkRandom rand;
             for (int j = 0; j < 10; j++) {
                 SkScalar x = 0, y = 0;
                 switch (fMode) {
                     case kTiled:  x = SkScalar(256 * rand.nextULessThan(4));
                                   y = SkScalar(256 * rand.nextULessThan(4));
                                   break;
                     case kRandom: x = rand.nextRangeScalar(0, 768);
@@ skipping 11 matching lines @@
     BBH                     fBBH;
     Mode                    fMode;
     SkString                fName;
     SkAutoTUnref<SkPicture> fPic;
 };
 
 DEF_BENCH( return new TiledPlaybackBench(kNone,     kRandom); )
 DEF_BENCH( return new TiledPlaybackBench(kNone,     kTiled ); )
 DEF_BENCH( return new TiledPlaybackBench(kRTree,    kRandom); )
 DEF_BENCH( return new TiledPlaybackBench(kRTree,    kTiled ); )