Refactoring: get rid of the SkBenchmark void* parameter.

bench/BitmapScaleBench.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 "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkShader.h"
 #include "SkString.h"
 #include "SkBlurMask.h"
 
 class BitmapScaleBench: public SkBenchmark {
     int         fLoopCount;
     int         fInputSize;
     int         fOutputSize;
     SkString    fName;
 
 public:
-    BitmapScaleBench(void *param, int is, int os) : INHERITED(param) {
+    BitmapScaleBench( int is, int os)  {
         fInputSize = is;
         fOutputSize = os;
 
         fLoopCount = 20;
     }
 
 protected:
 
     SkBitmap fInputBitmap, fOutputBitmap;
     SkMatrix fMatrix;
@@ skipping 47 matching lines @@
     }
 
     virtual void doScaleImage() = 0;
     virtual void preBenchSetup() {}
 private:
     typedef SkBenchmark INHERITED;
 };
 
 class BitmapFilterScaleBench: public BitmapScaleBench {
  public:
-    BitmapFilterScaleBench(void *param, int is, int os) : INHERITED(param, is, os) {
+    BitmapFilterScaleBench( int is, int os) : INHERITED(is, os) {
         setName( "filter" );
     }
 protected:
     virtual void doScaleImage() SK_OVERRIDE {
         SkCanvas canvas( fOutputBitmap );
         SkPaint paint;
 
         paint.setFilterLevel(SkPaint::kHigh_FilterLevel);
         canvas.drawBitmapMatrix( fInputBitmap, fMatrix, &paint );
     }
 private:
     typedef BitmapScaleBench INHERITED;
 };
 
-DEF_BENCH(return new BitmapFilterScaleBench(p, 10, 90);)
-DEF_BENCH(return new BitmapFilterScaleBench(p, 30, 90);)
-DEF_BENCH(return new BitmapFilterScaleBench(p, 80, 90);)
-DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 90);)
-DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 80);)
-DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 30);)
-DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 10);)
-DEF_BENCH(return new BitmapFilterScaleBench(p, 256, 64);)
-DEF_BENCH(return new BitmapFilterScaleBench(p, 64, 256);)
+DEF_BENCH(return new BitmapFilterScaleBench(10, 90);)
+DEF_BENCH(return new BitmapFilterScaleBench(30, 90);)
+DEF_BENCH(return new BitmapFilterScaleBench(80, 90);)
+DEF_BENCH(return new BitmapFilterScaleBench(90, 90);)
+DEF_BENCH(return new BitmapFilterScaleBench(90, 80);)
+DEF_BENCH(return new BitmapFilterScaleBench(90, 30);)
+DEF_BENCH(return new BitmapFilterScaleBench(90, 10);)
+DEF_BENCH(return new BitmapFilterScaleBench(256, 64);)
+DEF_BENCH(return new BitmapFilterScaleBench(64, 256);)