Refactoring: get rid of the SkBenchmark void* parameter.

bench/PremulAndUnpremulAlphaOpsBench.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 "SkConfig8888.h"
 #include "SkString.h"
 
 class PremulAndUnpremulAlphaOpsBench : public SkBenchmark {
 public:
-    PremulAndUnpremulAlphaOpsBench(void* param, SkCanvas::Config8888 config)
-        : INHERITED(param) {
+    PremulAndUnpremulAlphaOpsBench(SkCanvas::Config8888 config) {
         fUnPremulConfig = config;
         fName.printf("premul_and_unpremul_alpha_%s",
                      (config ==  SkCanvas::kRGBA_Unpremul_Config8888) ?
                      "RGBA8888" : "Native8888");
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
@@ skipping 25 matching lines @@
             canvas->readPixels(&bmp2, 0, 0, fUnPremulConfig);
         }
     }
 
 private:
     SkCanvas::Config8888 fUnPremulConfig;
     SkString fName;
     typedef SkBenchmark INHERITED;
 };
 
-static SkBenchmark* fact0(void* p) {
-    return new PremulAndUnpremulAlphaOpsBench(p,
-        SkCanvas::kRGBA_Unpremul_Config8888);
-}
-static SkBenchmark* fact1(void* p) {
-    return new PremulAndUnpremulAlphaOpsBench(p,
-        SkCanvas::kNative_Unpremul_Config8888);
-}
 
-static BenchRegistry gReg0(fact0);
-static BenchRegistry gReg1(fact1);
+DEF_BENCH(return new PremulAndUnpremulAlphaOpsBench(SkCanvas::kRGBA_Unpremul_Config8888));
+DEF_BENCH(return new PremulAndUnpremulAlphaOpsBench(SkCanvas::kNative_Unpremul_Config8888));