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/PremulAndUnpremulAlphaOpsBench.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'bench/PremulAndUnpremulAlphaOpsBench.cpp') diff --git a/bench/PremulAndUnpremulAlphaOpsBench.cpp b/bench/PremulAndUnpremulAlphaOpsBench.cpp index eb494f46d9..aac5934b4c 100644 --- a/bench/PremulAndUnpremulAlphaOpsBench.cpp +++ b/bench/PremulAndUnpremulAlphaOpsBench.cpp @@ -13,8 +13,7 @@ class PremulAndUnpremulAlphaOpsBench : public SkBenchmark { public: - PremulAndUnpremulAlphaOpsBench(void* param, SkCanvas::Config8888 config) - : INHERITED(param) { + PremulAndUnpremulAlphaOpsBench(SkCanvas::Config8888 config) { fUnPremulConfig = config; fName.printf("premul_and_unpremul_alpha_%s", (config == SkCanvas::kRGBA_Unpremul_Config8888) ? @@ -60,14 +59,6 @@ private: typedef SkBenchmark INHERITED; }; -static SkBenchmark* fact0(void* p) { - return new PremulAndUnpremulAlphaOpsBench(p, - SkCanvas::kRGBA_Unpremul_Config8888); -} -static SkBenchmark* fact1(void* p) { - return new PremulAndUnpremulAlphaOpsBench(p, - SkCanvas::kNative_Unpremul_Config8888); -} -static BenchRegistry gReg0(fact0); -static BenchRegistry gReg1(fact1); +DEF_BENCH(return new PremulAndUnpremulAlphaOpsBench(SkCanvas::kRGBA_Unpremul_Config8888)); +DEF_BENCH(return new PremulAndUnpremulAlphaOpsBench(SkCanvas::kNative_Unpremul_Config8888)); -- cgit v1.2.3