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/ShaderMaskBench.cpp | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'bench/ShaderMaskBench.cpp') diff --git a/bench/ShaderMaskBench.cpp b/bench/ShaderMaskBench.cpp index 2738cff68b..71ca047018 100644 --- a/bench/ShaderMaskBench.cpp +++ b/bench/ShaderMaskBench.cpp @@ -38,7 +38,7 @@ class ShaderMaskBench : public SkBenchmark { SkString fName; FontQuality fFQ; public: - ShaderMaskBench(void* param, bool isOpaque, FontQuality fq) : INHERITED(param) { + ShaderMaskBench(bool isOpaque, FontQuality fq) { fFQ = fq; fText.set(STR); @@ -91,16 +91,9 @@ private: /////////////////////////////////////////////////////////////////////////////// -static SkBenchmark* Fact00(void* p) { return new ShaderMaskBench(p, true, kBW); } -static SkBenchmark* Fact01(void* p) { return new ShaderMaskBench(p, false, kBW); } -static SkBenchmark* Fact10(void* p) { return new ShaderMaskBench(p, true, kAA); } -static SkBenchmark* Fact11(void* p) { return new ShaderMaskBench(p, false, kAA); } -static SkBenchmark* Fact20(void* p) { return new ShaderMaskBench(p, true, kLCD); } -static SkBenchmark* Fact21(void* p) { return new ShaderMaskBench(p, false, kLCD); } - -static BenchRegistry gReg00(Fact00); -static BenchRegistry gReg01(Fact01); -static BenchRegistry gReg10(Fact10); -static BenchRegistry gReg11(Fact11); -static BenchRegistry gReg20(Fact20); -static BenchRegistry gReg21(Fact21); +DEF_BENCH( return new ShaderMaskBench(true, kBW); ) +DEF_BENCH( return new ShaderMaskBench(false, kBW); ) +DEF_BENCH( return new ShaderMaskBench(true, kAA); ) +DEF_BENCH( return new ShaderMaskBench(false, kAA); ) +DEF_BENCH( return new ShaderMaskBench(true, kLCD); ) +DEF_BENCH( return new ShaderMaskBench(false, kLCD); ) -- cgit v1.2.3