Major bench refactoring.

bench/ColorFilterBench.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkColorMatrixFilter.h"
@@ skipping 58 matching lines @@
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return isSmall() ? "colorfilter_dim_bright_small" : "colorfilter_dim_bright_large";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkRect r = getFilterRect();
         SkPaint paint;
         paint.setColor(SK_ColorRED);
-        for (float brightness = -1.0f; brightness <= 1.0f; brightness += 0.4f) {
-            SkAutoTUnref<SkImageFilter> dim(make_brightness(-brightness));
-            SkAutoTUnref<SkImageFilter> bright(make_brightness(brightness, dim));
-            paint.setImageFilter(bright);
-            canvas->drawRect(r, paint);
+
+        for (int i = 0; i < this->getLoops(); i++) {
+            for (float brightness = -1.0f; brightness <= 1.0f; brightness += 0.4f) {
+                SkAutoTUnref<SkImageFilter> dim(make_brightness(-brightness));
+                SkAutoTUnref<SkImageFilter> bright(make_brightness(brightness, dim));
+                paint.setImageFilter(bright);
+                canvas->drawRect(r, paint);
+            }
         }
     }
 
 private:
     typedef ColorFilterBaseBench INHERITED;
 };
 
 class ColorFilterBrightGrayBench : public ColorFilterBaseBench {
 
 public:
     ColorFilterBrightGrayBench(void* param, bool small) : INHERITED(param, small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return isSmall() ? "colorfilter_bright_gray_small" : "colorfilter_bright_gray_large";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkRect r = getFilterRect();
         SkPaint paint;
         paint.setColor(SK_ColorRED);
-        {
+        for (int i = 0; i < this->getLoops(); i++) {
             SkAutoTUnref<SkImageFilter> brightness(make_brightness(0.9f));
             SkAutoTUnref<SkImageFilter> grayscale(make_grayscale(brightness));
             paint.setImageFilter(grayscale);
             canvas->drawRect(r, paint);
         }
     }
 
 private:
     typedef ColorFilterBaseBench INHERITED;
 };
 
 class ColorFilterGrayBrightBench : public ColorFilterBaseBench {
 
 public:
     ColorFilterGrayBrightBench(void* param, bool small) : INHERITED(param, small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return isSmall() ? "colorfilter_gray_bright_small" : "colorfilter_gray_bright_large";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkRect r = getFilterRect();
         SkPaint paint;
         paint.setColor(SK_ColorRED);
-        {
+        for (int i = 0; i < this->getLoops(); i++) {
             SkAutoTUnref<SkImageFilter> grayscale(make_grayscale());
             SkAutoTUnref<SkImageFilter> brightness(make_brightness(0.9f, grayscale));
             paint.setImageFilter(brightness);
             canvas->drawRect(r, paint);
         }
     }
 
 private:
     typedef ColorFilterBaseBench INHERITED;
 };
 
 class ColorFilterBlueBrightBench : public ColorFilterBaseBench {
 
 public:
     ColorFilterBlueBrightBench(void* param, bool small) : INHERITED(param, small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return isSmall() ? "colorfilter_blue_bright_small" : "colorfilter_blue_bright_large";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkRect r = getFilterRect();
         SkPaint paint;
         paint.setColor(SK_ColorRED);
-        {
+        for (int i = 0; i < this->getLoops(); i++) {
             SkAutoTUnref<SkImageFilter> blue(make_mode_blue());
             SkAutoTUnref<SkImageFilter> brightness(make_brightness(1.0f, blue));
             paint.setImageFilter(brightness);
             canvas->drawRect(r, paint);
         }
     }
 
 private:
     typedef ColorFilterBaseBench INHERITED;
 };
 
 class ColorFilterBrightBlueBench : public ColorFilterBaseBench {
 
 public:
     ColorFilterBrightBlueBench(void* param, bool small) : INHERITED(param, small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return isSmall() ? "colorfilter_bright_blue_small" : "colorfilter_bright_blue_large";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkRect r = getFilterRect();
         SkPaint paint;
         paint.setColor(SK_ColorRED);
-        {
+        for (int i = 0; i < this->getLoops(); i++) {
             SkAutoTUnref<SkImageFilter> brightness(make_brightness(1.0f));
             SkAutoTUnref<SkImageFilter> blue(make_mode_blue(brightness));
             paint.setImageFilter(blue);
             canvas->drawRect(r, paint);
         }
     }
 
 private:
     typedef ColorFilterBaseBench INHERITED;
 };
 
 class ColorFilterBrightBench : public ColorFilterBaseBench {
 
 public:
     ColorFilterBrightBench(void* param, bool small) : INHERITED(param, small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return isSmall() ? "colorfilter_bright_small" : "colorfilter_bright_large";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkRect r = getFilterRect();
         SkPaint paint;
         paint.setColor(SK_ColorRED);
-        {
+        for (int i = 0; i < this->getLoops(); i++) {
             SkAutoTUnref<SkImageFilter> brightness(make_brightness(1.0f));
             paint.setImageFilter(brightness);
             canvas->drawRect(r, paint);
         }
     }
 
 private:
     typedef ColorFilterBaseBench INHERITED;
 };
 
 class ColorFilterBlueBench : public ColorFilterBaseBench {
 
 public:
     ColorFilterBlueBench(void* param, bool small) : INHERITED(param, small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return isSmall() ? "colorfilter_blue_small" : "colorfilter_blue_large";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkRect r = getFilterRect();
         SkPaint paint;
         paint.setColor(SK_ColorRED);
-        {
+        for (int i = 0; i < this->getLoops(); i++) {
             SkAutoTUnref<SkImageFilter> blue(make_mode_blue());
             paint.setImageFilter(blue);
             canvas->drawRect(r, paint);
         }
     }
 
 private:
     typedef ColorFilterBaseBench INHERITED;
 };
 
 class ColorFilterGrayBench : public ColorFilterBaseBench {
 
 public:
     ColorFilterGrayBench(void* param, bool small) : INHERITED(param, small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return isSmall() ? "colorfilter_gray_small" : "colorfilter_gray_large";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkRect r = getFilterRect();
         SkPaint paint;
         paint.setColor(SK_ColorRED);
-        {
+        for (int i = 0; i < this->getLoops(); i++) {
             SkAutoTUnref<SkImageFilter> grayscale(make_grayscale());
             paint.setImageFilter(grayscale);
             canvas->drawRect(r, paint);
         }
     }
 
 private:
     typedef ColorFilterBaseBench INHERITED;
 };
 
 class TableColorFilterBench : public ColorFilterBaseBench {
 
 public:
     TableColorFilterBench(void* param, bool small) : INHERITED(param, small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return isSmall() ? "table_colorfilter_small" : "table_colorfilter_large";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkRect r = getFilterRect();
         SkPaint paint;
         paint.setColor(SK_ColorRED);
-        {
+        for (int i = 0; i < this->getLoops(); i++) {
             SkAutoTUnref<SkColorFilter> table_filter(make_table_filter());
             paint.setColorFilter(table_filter);
             canvas->drawRect(r, paint);
         }
     }
 
 private:
     static void fill_table_data(uint8_t table[]) {
         for (int i = 0; i < 256; ++i) {
             int n = i >> 5;
@@ skipping 23 matching lines @@
 
 DEF_BENCH( return new ColorFilterDimBrightBench(p, false); )
 DEF_BENCH( return new ColorFilterBrightGrayBench(p, false); )
 DEF_BENCH( return new ColorFilterGrayBrightBench(p, false); )
 DEF_BENCH( return new ColorFilterBlueBrightBench(p, false); )
 DEF_BENCH( return new ColorFilterBrightBlueBench(p, false); )
 DEF_BENCH( return new ColorFilterBrightBench(p, false); )
 DEF_BENCH( return new ColorFilterBlueBench(p, false); )
 DEF_BENCH( return new ColorFilterGrayBench(p, false); )
 DEF_BENCH( return new TableColorFilterBench(p, false); )