Refactoring: get rid of the SkBenchmark void* parameter.

bench/GrMemoryPoolBench.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.
  */
 
 // This tests a Gr class
 #if SK_SUPPORT_GPU
 
@@ skipping 17 matching lines @@
 };
 GrMemoryPool A::gPool(10 * (1 << 10), 10 * (1 << 10));
 }
 
 
 /**
  * This benchmark creates and deletes objects in stack order
  */
 class GrMemoryPoolBenchStack : public SkBenchmark {
 public:
-    GrMemoryPoolBenchStack(void* param) : INHERITED(param) {
+    GrMemoryPoolBenchStack()  {
         fIsRendering = false;
     }
 protected:
     virtual const char* onGetName() {
         return "grmemorypool_stack";
     }
 
     virtual void onDraw(SkCanvas*) {
         SkRandom r;
         enum {
@@ skipping 30 matching lines @@
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 /**
  * This benchmark creates objects and deletes them in random order
  */
 class GrMemoryPoolBenchRandom : public SkBenchmark {
 public:
-    GrMemoryPoolBenchRandom(void* param) : INHERITED(param) {
+    GrMemoryPoolBenchRandom()  {
         fIsRendering = false;
     }
 protected:
     virtual const char* onGetName() {
         return "grmemorypool_random";
     }
 
     virtual void onDraw(SkCanvas*) {
         SkRandom r;
         enum {
@@ skipping 16 matching lines @@
 };
 
 /**
  * This benchmark creates objects and deletes them in queue order
  */
 class GrMemoryPoolBenchQueue : public SkBenchmark {
     enum {
         M = 4 * (1 << 10),
     };
 public:
-    GrMemoryPoolBenchQueue(void* param) : INHERITED(param) {
+    GrMemoryPoolBenchQueue()  {
         fIsRendering = false;
     }
 protected:
     virtual const char* onGetName() {
         return "grmemorypool_queue";
     }
 
     virtual void onDraw(SkCanvas*) {
         SkRandom r;
         A* objects[M];
         for (int i = 0; i < this->getLoops(); i++) {
             uint32_t count = r.nextRangeU(0, M-1);
             for (uint32_t i = 0; i < count; i++) {
                 objects[i] = new A;
             }
             for (uint32_t i = 0; i < count; i++) {
                 delete objects[i];
             }
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkBenchmark* Fact1(void* p) { return new GrMemoryPoolBenchStack(p); }
-static SkBenchmark* Fact2(void* p) { return new GrMemoryPoolBenchRandom(p); }
-static SkBenchmark* Fact3(void* p) { return new GrMemoryPoolBenchQueue(p); }
-
-static BenchRegistry gReg01(Fact1);
-static BenchRegistry gReg02(Fact2);
-static BenchRegistry gReg03(Fact3);
-
+DEF_BENCH( return new GrMemoryPoolBenchStack(); )
+DEF_BENCH( return new GrMemoryPoolBenchRandom(); )
+DEF_BENCH( return new GrMemoryPoolBenchQueue(); )
 #endif