Refactoring: get rid of the SkBenchmark void* parameter.

bench/PictureRecordBench.cpp

 /*
  * Copyright 2012 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 "SkColor.h"
 #include "SkPaint.h"
 #include "SkPicture.h"
 #include "SkPoint.h"
 #include "SkRandom.h"
 #include "SkRect.h"
 #include "SkString.h"
 
 class PictureRecordBench : public SkBenchmark {
 public:
-    PictureRecordBench(void* param, const char name[]) : INHERITED(param) {
+    PictureRecordBench(const char name[])  {
         fName.printf("picture_record_%s", name);
         fPictureWidth = SkIntToScalar(PICTURE_WIDTH);
         fPictureHeight = SkIntToScalar(PICTURE_HEIGHT);
         fIsRendering = false;
     }
 
     enum {
         PICTURE_WIDTH = 1000,
         PICTURE_HEIGHT = 4000,
     };
@@ skipping 24 matching lines @@
     typedef SkBenchmark INHERITED;
 };
 
 /*
  *  An SkPicture has internal dictionaries to store bitmaps, matrices, paints,
  *  and regions.  This bench populates those dictionaries to test the speed of
  *  reading and writing to those particular dictionary data structures.
  */
 class DictionaryRecordBench : public PictureRecordBench {
 public:
-    DictionaryRecordBench(void* param)
-        : INHERITED(param, "dictionaries") { }
+    DictionaryRecordBench()
+        : INHERITED("dictionaries") { }
 
 protected:
     virtual void recordCanvas(SkCanvas* canvas) {
 
         const SkPoint translateDelta = getTranslateDelta(this->getLoops());
 
         for (int i = 0; i < this->getLoops(); i++) {
 
             SkColor color = SK_ColorYELLOW + (i % 255);
             SkIRect rect = SkIRect::MakeWH(i % PICTURE_WIDTH, i % PICTURE_HEIGHT);
@@ skipping 40 matching lines @@
 private:
     typedef PictureRecordBench INHERITED;
 };
 
 /*
  *  Populates the SkPaint dictionary with a large number of unique paint
  *  objects that differ only by color
  */
 class UniquePaintDictionaryRecordBench : public PictureRecordBench {
 public:
-    UniquePaintDictionaryRecordBench(void* param)
-        : INHERITED(param, "unique_paint_dictionary") { }
+    UniquePaintDictionaryRecordBench()
+        : INHERITED("unique_paint_dictionary") { }
 
 protected:
     virtual void recordCanvas(SkCanvas* canvas) {
         SkRandom rand;
         for (int i = 0; i < this->getLoops(); i++) {
             SkPaint paint;
             paint.setColor(rand.nextU());
             canvas->drawPaint(paint);
         }
     }
 
 private:
     typedef PictureRecordBench INHERITED;
 };
 
 /*
  *  Populates the SkPaint dictionary with a number of unique paint
  *  objects that get reused repeatedly.
  *
  *  Re-creating the paint objects in the inner loop slows the benchmark down 10%.
  *  Using setColor(i % objCount) instead of a random color creates a very high rate
  *  of hash conflicts, slowing us down 12%.
  */
 class RecurringPaintDictionaryRecordBench : public PictureRecordBench {
 public:
-    RecurringPaintDictionaryRecordBench(void* param)
-        : INHERITED(param, "recurring_paint_dictionary") {
+    RecurringPaintDictionaryRecordBench()
+        : INHERITED("recurring_paint_dictionary") {
         SkRandom rand;
         for (int i = 0; i < ObjCount; i++) {
             fPaint[i].setColor(rand.nextU());
         }
     }
 
     enum {
         ObjCount = 100,  // number of unique paint objects
     };
 protected:
     virtual void recordCanvas(SkCanvas* canvas) {
 
         for (int i = 0; i < this->getLoops(); i++) {
             canvas->drawPaint(fPaint[i % ObjCount]);
         }
     }
 
 private:
     SkPaint fPaint [ObjCount];
     typedef PictureRecordBench INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkBenchmark* Fact0(void* p) { return new DictionaryRecordBench(p); }
-static SkBenchmark* Fact1(void* p) { return new UniquePaintDictionaryRecordBench(p); }
-static SkBenchmark* Fact2(void* p) { return new RecurringPaintDictionaryRecordBench(p); }
-
-static BenchRegistry gReg0(Fact0);
-static BenchRegistry gReg1(Fact1);
-static BenchRegistry gReg2(Fact2);
+DEF_BENCH( return new DictionaryRecordBench(); )
+DEF_BENCH( return new UniquePaintDictionaryRecordBench(); )
+DEF_BENCH( return new RecurringPaintDictionaryRecordBench(); )