diff options
| author |  mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-13 19:52:27 +0000 |
|---|---|---|
| committer | mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-13 19:52:27 +0000 |
| commit | 410e6e80f00a6c660675c80904807a041c7b7d2a (patch) | |
| tree | e6b7287001f032ae9a9e09de19db5d0867bea9e3 /bench/PicturePlaybackBench.cpp | |
| parent | af54a513a5b7723b53f61730afe0ad6256881749 (diff) | |
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
Diffstat (limited to 'bench/PicturePlaybackBench.cpp')
| -rw-r--r-- | bench/PicturePlaybackBench.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
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); ) |