Refactoring: get rid of the SkBenchmark void* parameter.

bench/XfermodeBench.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 "SkString.h"
 #include "SkXfermode.h"
 #include "SkLumaXfermode.h"
 
 // Benchmark that draws non-AA rects with an SkXfermode::Mode
 class XfermodeBench : public SkBenchmark {
 public:
-    XfermodeBench(void* param, SkXfermode::Mode mode) : SkBenchmark(param) {
+    XfermodeBench(SkXfermode::Mode mode) {
         fXfermode.reset(SkXfermode::Create(mode));
         SkASSERT(NULL != fXfermode.get() || SkXfermode::kSrcOver_Mode == mode);
         fName.printf("Xfermode_%s", SkXfermode::ModeName(mode));
     }
 
-    XfermodeBench(void* param, SkXfermode* xferMode, const char* name)
-        : SkBenchmark(param) {
+    XfermodeBench(SkXfermode* xferMode, const char* name) {
         SkASSERT(NULL != xferMode);
         fXfermode.reset(xferMode);
         fName.printf("Xfermode_%s", name);
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE { return fName.c_str(); }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkISize size = canvas->getDeviceSize();
@@ skipping 23 matching lines @@
     SkString fName;
 
     typedef SkBenchmark INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 #define CONCAT_I(x, y) x ## y
 #define CONCAT(x, y) CONCAT_I(x, y) // allow for macro expansion
 #define BENCH(...) \
-    static SkBenchmark* CONCAT(Fact, __LINE__)(void *p) { return new XfermodeBench(p, __VA_ARGS__); };\
-    static BenchRegistry CONCAT(gReg, __LINE__)(CONCAT(Fact, __LINE__));
+    DEF_BENCH( return new XfermodeBench(__VA_ARGS__); );\
+
 
 BENCH(SkXfermode::kClear_Mode)
 BENCH(SkXfermode::kSrc_Mode)
 BENCH(SkXfermode::kDst_Mode)
 BENCH(SkXfermode::kSrcOver_Mode)
 BENCH(SkXfermode::kDstOver_Mode)
 BENCH(SkXfermode::kSrcIn_Mode)
 BENCH(SkXfermode::kDstIn_Mode)
 BENCH(SkXfermode::kSrcOut_Mode)
 BENCH(SkXfermode::kDstOut_Mode)
@@ skipping 16 matching lines @@
 BENCH(SkXfermode::kExclusion_Mode)
 BENCH(SkXfermode::kMultiply_Mode)
 
 BENCH(SkXfermode::kHue_Mode)
 BENCH(SkXfermode::kSaturation_Mode)
 BENCH(SkXfermode::kColor_Mode)
 BENCH(SkXfermode::kLuminosity_Mode)
 
 BENCH(SkLumaMaskXfermode::Create(SkXfermode::kSrcIn_Mode), "SrcInLuma")
 BENCH(SkLumaMaskXfermode::Create(SkXfermode::kDstIn_Mode), "DstInLuma")