Refactoring: get rid of the SkBenchmark void* parameter.

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 "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkPaint.h"
 #include "SkPicture.h"
 #include "SkPoint.h"
 #include "SkRect.h"
 #include "SkString.h"
 
 // This is designed to emulate about 4 screens of textual content
 
 
 class PicturePlaybackBench : public SkBenchmark {
 public:
-    PicturePlaybackBench(void* param, const char name[]) : INHERITED(param) {
+    PicturePlaybackBench(const char name[])  {
         fName.printf("picture_playback_%s", name);
         fPictureWidth = SkIntToScalar(PICTURE_WIDTH);
         fPictureHeight = SkIntToScalar(PICTURE_HEIGHT);
         fTextSize = SkIntToScalar(TEXT_SIZE);
     }
 
     enum {
         PICTURE_WIDTH = 1000,
         PICTURE_HEIGHT = 4000,
         TEXT_SIZE = 10
@@ skipping 30 matching lines @@
     SkScalar fPictureWidth;
     SkScalar fPictureHeight;
     SkScalar fTextSize;
 private:
     typedef SkBenchmark INHERITED;
 };
 
 
 class TextPlaybackBench : public PicturePlaybackBench {
 public:
-    TextPlaybackBench(void* param) : INHERITED(param, "drawText") { }
+    TextPlaybackBench() : INHERITED("drawText") { }
 protected:
     virtual void recordCanvas(SkCanvas* canvas) {
         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(void* param, bool drawPosH)
-        : INHERITED(param, drawPosH ? "drawPosTextH" : "drawPosText")
+    PosTextPlaybackBench(bool drawPosH)
+        : INHERITED(drawPosH ? "drawPosTextH" : "drawPosText")
         , fDrawPosH(drawPosH) { }
 protected:
     virtual void recordCanvas(SkCanvas* canvas) {
         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);
@@ skipping 22 matching lines @@
         delete[] adv;
     }
 private:
     bool fDrawPosH;
     typedef PicturePlaybackBench INHERITED;
 };
 
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkBenchmark* Fact0(void* p) { return new TextPlaybackBench(p); }
-static SkBenchmark* Fact1(void* p) { return new PosTextPlaybackBench(p, true); }
-static SkBenchmark* Fact2(void* p) { return new PosTextPlaybackBench(p, false); }
-
-static BenchRegistry gReg0(Fact0);
-static BenchRegistry gReg1(Fact1);
-static BenchRegistry gReg2(Fact2);
+DEF_BENCH( return new TextPlaybackBench(); )
+DEF_BENCH( return new PosTextPlaybackBench(true); )
+DEF_BENCH( return new PosTextPlaybackBench(false); )