Refactoring: get rid of the SkBenchmark void* parameter.
While I was doing massive sed-ing, I also converted every bench to use DEF_BENCH instead of registering the ugly manual way.
BUG=
R=scroggo@google.com
Review URL: https://codereview.chromium.org/23876006
git-svn-id: http://skia.googlecode.com/svn/trunk@11263 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/DisplacementBench.cpp b/bench/DisplacementBench.cpp
index bf1ee73..3d0f215 100644
--- a/bench/DisplacementBench.cpp
+++ b/bench/DisplacementBench.cpp
@@ -17,8 +17,8 @@
class DisplacementBaseBench : public SkBenchmark {
public:
- DisplacementBaseBench(void* param, bool small) :
- INHERITED(param), fInitialized(false), fIsSmall(small) {
+ DisplacementBaseBench(bool small) :
+ fInitialized(false), fIsSmall(small) {
}
protected:
@@ -90,7 +90,7 @@
class DisplacementZeroBench : public DisplacementBaseBench {
public:
- DisplacementZeroBench(void* param, bool small) : INHERITED(param, small) {
+ DisplacementZeroBench(bool small) : INHERITED(small) {
}
protected:
@@ -117,7 +117,7 @@
class DisplacementAlphaBench : public DisplacementBaseBench {
public:
- DisplacementAlphaBench(void* param, bool small) : INHERITED(param, small) {
+ DisplacementAlphaBench(bool small) : INHERITED(small) {
}
protected:
@@ -143,7 +143,7 @@
class DisplacementFullBench : public DisplacementBaseBench {
public:
- DisplacementFullBench(void* param, bool small) : INHERITED(param, small) {
+ DisplacementFullBench(bool small) : INHERITED(small) {
}
protected:
@@ -169,9 +169,9 @@
///////////////////////////////////////////////////////////////////////////////
-DEF_BENCH( return new DisplacementZeroBench(p, true); )
-DEF_BENCH( return new DisplacementAlphaBench(p, true); )
-DEF_BENCH( return new DisplacementFullBench(p, true); )
-DEF_BENCH( return new DisplacementZeroBench(p, false); )
-DEF_BENCH( return new DisplacementAlphaBench(p, false); )
-DEF_BENCH( return new DisplacementFullBench(p, false); )
+DEF_BENCH( return new DisplacementZeroBench(true); )
+DEF_BENCH( return new DisplacementAlphaBench(true); )
+DEF_BENCH( return new DisplacementFullBench(true); )
+DEF_BENCH( return new DisplacementZeroBench(false); )
+DEF_BENCH( return new DisplacementAlphaBench(false); )
+DEF_BENCH( return new DisplacementFullBench(false); )