From 3361471a3504ecd0351ff70f4c42d8d6fee963d4 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 3 Dec 2013 18:17:16 +0000 Subject: Simplify benchmark internal API. I'm not quite sure why I wrote such a convoluted API with setLoops()/getLoops(). This replaces it with a loops argument passed to onDraw(). This CL is largely mechanical translation from the old API to the new one. MathBench used this->getLoops() outside onDraw(), which seems incorrect. I fixed it. BUG= R=djsollen@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/99893003 git-svn-id: http://skia.googlecode.com/svn/trunk@12466 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench/DisplacementBench.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bench/DisplacementBench.cpp') diff --git a/bench/DisplacementBench.cpp b/bench/DisplacementBench.cpp index 72d482ee0e..77ac305852 100644 --- a/bench/DisplacementBench.cpp +++ b/bench/DisplacementBench.cpp @@ -99,7 +99,7 @@ protected: return this->isSmall() ? "displacement_zero_small" : "displacement_zero_large"; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkAutoTUnref displ(SkNEW_ARGS(SkBitmapSource, (fCheckerboard))); // No displacement effect @@ -107,7 +107,7 @@ protected: (SkDisplacementMapEffect::kR_ChannelSelectorType, SkDisplacementMapEffect::kG_ChannelSelectorType, 0.0f, displ)))->unref(); - for (int i = 0; i < this->getLoops(); i++) { + for (int i = 0; i < loops; i++) { this->drawClippedBitmap(canvas, 0, 0, paint); } } @@ -126,14 +126,14 @@ protected: return isSmall() ? "displacement_alpha_small" : "displacement_alpha_large"; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkAutoTUnref displ(SkNEW_ARGS(SkBitmapSource, (fCheckerboard))); // Displacement, with 1 alpha component (which isn't pre-multiplied) paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect, (SkDisplacementMapEffect::kB_ChannelSelectorType, SkDisplacementMapEffect::kA_ChannelSelectorType, 16.0f, displ)))->unref(); - for (int i = 0; i < this->getLoops(); i++) { + for (int i = 0; i < loops; i++) { drawClippedBitmap(canvas, 100, 0, paint); } } @@ -152,14 +152,14 @@ protected: return isSmall() ? "displacement_full_small" : "displacement_full_large"; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkAutoTUnref displ(SkNEW_ARGS(SkBitmapSource, (fCheckerboard))); // Displacement, with 2 non-alpha components paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect, (SkDisplacementMapEffect::kR_ChannelSelectorType, SkDisplacementMapEffect::kB_ChannelSelectorType, 32.0f, displ)))->unref(); - for (int i = 0; i < this->getLoops(); ++i) { + for (int i = 0; i < loops; ++i) { this->drawClippedBitmap(canvas, 200, 0, paint); } } -- cgit v1.2.3