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/ColorFilterBench.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'bench/ColorFilterBench.cpp') diff --git a/bench/ColorFilterBench.cpp b/bench/ColorFilterBench.cpp index ad27f15806..9fec587b5c 100644 --- a/bench/ColorFilterBench.cpp +++ b/bench/ColorFilterBench.cpp @@ -72,12 +72,12 @@ protected: return isSmall() ? "colorfilter_dim_bright_small" : "colorfilter_dim_bright_large"; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); - for (int i = 0; i < this->getLoops(); i++) { + for (int i = 0; i < loops; i++) { for (float brightness = -1.0f; brightness <= 1.0f; brightness += 0.4f) { SkAutoTUnref dim(make_brightness(-brightness)); SkAutoTUnref bright(make_brightness(brightness, dim)); @@ -102,11 +102,11 @@ protected: return isSmall() ? "colorfilter_bright_gray_small" : "colorfilter_bright_gray_large"; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); - for (int i = 0; i < this->getLoops(); i++) { + for (int i = 0; i < loops; i++) { SkAutoTUnref brightness(make_brightness(0.9f)); SkAutoTUnref grayscale(make_grayscale(brightness)); paint.setImageFilter(grayscale); @@ -129,11 +129,11 @@ protected: return isSmall() ? "colorfilter_gray_bright_small" : "colorfilter_gray_bright_large"; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); - for (int i = 0; i < this->getLoops(); i++) { + for (int i = 0; i < loops; i++) { SkAutoTUnref grayscale(make_grayscale()); SkAutoTUnref brightness(make_brightness(0.9f, grayscale)); paint.setImageFilter(brightness); @@ -156,11 +156,11 @@ protected: return isSmall() ? "colorfilter_blue_bright_small" : "colorfilter_blue_bright_large"; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); - for (int i = 0; i < this->getLoops(); i++) { + for (int i = 0; i < loops; i++) { SkAutoTUnref blue(make_mode_blue()); SkAutoTUnref brightness(make_brightness(1.0f, blue)); paint.setImageFilter(brightness); @@ -183,11 +183,11 @@ protected: return isSmall() ? "colorfilter_bright_blue_small" : "colorfilter_bright_blue_large"; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); - for (int i = 0; i < this->getLoops(); i++) { + for (int i = 0; i < loops; i++) { SkAutoTUnref brightness(make_brightness(1.0f)); SkAutoTUnref blue(make_mode_blue(brightness)); paint.setImageFilter(blue); @@ -210,11 +210,11 @@ protected: return isSmall() ? "colorfilter_bright_small" : "colorfilter_bright_large"; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); - for (int i = 0; i < this->getLoops(); i++) { + for (int i = 0; i < loops; i++) { SkAutoTUnref brightness(make_brightness(1.0f)); paint.setImageFilter(brightness); canvas->drawRect(r, paint); @@ -236,11 +236,11 @@ protected: return isSmall() ? "colorfilter_blue_small" : "colorfilter_blue_large"; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); - for (int i = 0; i < this->getLoops(); i++) { + for (int i = 0; i < loops; i++) { SkAutoTUnref blue(make_mode_blue()); paint.setImageFilter(blue); canvas->drawRect(r, paint); @@ -262,11 +262,11 @@ protected: return isSmall() ? "colorfilter_gray_small" : "colorfilter_gray_large"; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); - for (int i = 0; i < this->getLoops(); i++) { + for (int i = 0; i < loops; i++) { SkAutoTUnref grayscale(make_grayscale()); paint.setImageFilter(grayscale); canvas->drawRect(r, paint); @@ -288,11 +288,11 @@ protected: return isSmall() ? "table_colorfilter_small" : "table_colorfilter_large"; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); - for (int i = 0; i < this->getLoops(); i++) { + for (int i = 0; i < loops; i++) { SkAutoTUnref table_filter(make_table_filter()); paint.setColorFilter(table_filter); canvas->drawRect(r, paint); @@ -326,12 +326,12 @@ protected: return isSmall() ? "luma_colorfilter_small" : "luma_colorfilter_large"; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); - for (int i = 0; i < this->getLoops(); i++) { + for (int i = 0; i < loops; i++) { SkAutoTUnref luma_filter(SkLumaColorFilter::Create()); paint.setColorFilter(luma_filter); canvas->drawRect(r, paint); -- cgit v1.2.3