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/MergeBench.cpp b/bench/MergeBench.cpp
index 98a918a..51be22f 100644
--- a/bench/MergeBench.cpp
+++ b/bench/MergeBench.cpp
@@ -17,8 +17,7 @@
class MergeBench : public SkBenchmark {
public:
- MergeBench(void* param, bool small) : INHERITED(param), fIsSmall(small), fInitialized(false) {
- }
+ MergeBench(bool small) : fIsSmall(small), fInitialized(false) { }
protected:
virtual const char* onGetName() SK_OVERRIDE {
@@ -98,5 +97,5 @@
///////////////////////////////////////////////////////////////////////////////
-DEF_BENCH( return new MergeBench(p, true); )
-DEF_BENCH( return new MergeBench(p, false); )
+DEF_BENCH( return new MergeBench(true); )
+DEF_BENCH( return new MergeBench(false); )