From 410e6e80f00a6c660675c80904807a041c7b7d2a Mon Sep 17 00:00:00 2001 From: "mtklein@google.com" Date: Fri, 13 Sep 2013 19:52:27 +0000 Subject: 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 --- bench/GrMemoryPoolBench.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'bench/GrMemoryPoolBench.cpp') diff --git a/bench/GrMemoryPoolBench.cpp b/bench/GrMemoryPoolBench.cpp index 5ad1afa51c..4fae5913c1 100644 --- a/bench/GrMemoryPoolBench.cpp +++ b/bench/GrMemoryPoolBench.cpp @@ -35,7 +35,7 @@ GrMemoryPool A::gPool(10 * (1 << 10), 10 * (1 << 10)); */ class GrMemoryPoolBenchStack : public SkBenchmark { public: - GrMemoryPoolBenchStack(void* param) : INHERITED(param) { + GrMemoryPoolBenchStack() { fIsRendering = false; } protected: @@ -86,7 +86,7 @@ private: */ class GrMemoryPoolBenchRandom : public SkBenchmark { public: - GrMemoryPoolBenchRandom(void* param) : INHERITED(param) { + GrMemoryPoolBenchRandom() { fIsRendering = false; } protected: @@ -123,7 +123,7 @@ class GrMemoryPoolBenchQueue : public SkBenchmark { M = 4 * (1 << 10), }; public: - GrMemoryPoolBenchQueue(void* param) : INHERITED(param) { + GrMemoryPoolBenchQueue() { fIsRendering = false; } protected: @@ -151,12 +151,7 @@ private: /////////////////////////////////////////////////////////////////////////////// -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 -- cgit v1.2.3