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/PicturePlaybackBench.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'bench/PicturePlaybackBench.cpp') diff --git a/bench/PicturePlaybackBench.cpp b/bench/PicturePlaybackBench.cpp index 7f8fe6f06e..9d233ec3c0 100644 --- a/bench/PicturePlaybackBench.cpp +++ b/bench/PicturePlaybackBench.cpp @@ -18,7 +18,7 @@ class PicturePlaybackBench : public SkBenchmark { public: - PicturePlaybackBench(void* param, const char name[]) : INHERITED(param) { + PicturePlaybackBench(const char name[]) { fName.printf("picture_playback_%s", name); fPictureWidth = SkIntToScalar(PICTURE_WIDTH); fPictureHeight = SkIntToScalar(PICTURE_HEIGHT); @@ -69,7 +69,7 @@ private: class TextPlaybackBench : public PicturePlaybackBench { public: - TextPlaybackBench(void* param) : INHERITED(param, "drawText") { } + TextPlaybackBench() : INHERITED("drawText") { } protected: virtual void recordCanvas(SkCanvas* canvas) { SkPaint paint; @@ -92,8 +92,8 @@ private: class PosTextPlaybackBench : public PicturePlaybackBench { public: - PosTextPlaybackBench(void* param, bool drawPosH) - : INHERITED(param, drawPosH ? "drawPosTextH" : "drawPosText") + PosTextPlaybackBench(bool drawPosH) + : INHERITED(drawPosH ? "drawPosTextH" : "drawPosText") , fDrawPosH(drawPosH) { } protected: virtual void recordCanvas(SkCanvas* canvas) { @@ -136,10 +136,6 @@ private: /////////////////////////////////////////////////////////////////////////////// -static SkBenchmark* Fact0(void* p) { return new TextPlaybackBench(p); } -static SkBenchmark* Fact1(void* p) { return new PosTextPlaybackBench(p, true); } -static SkBenchmark* Fact2(void* p) { return new PosTextPlaybackBench(p, false); } - -static BenchRegistry gReg0(Fact0); -static BenchRegistry gReg1(Fact1); -static BenchRegistry gReg2(Fact2); +DEF_BENCH( return new TextPlaybackBench(); ) +DEF_BENCH( return new PosTextPlaybackBench(true); ) +DEF_BENCH( return new PosTextPlaybackBench(false); ) -- cgit v1.2.3