Major bench refactoring.

bench/DisplacementBench.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 "SkBitmapDevice.h"
 #include "SkBitmapSource.h"
 #include "SkCanvas.h"
@@ skipping 87 matching lines @@
         return isSmall() ? "displacement_zero_small" : "displacement_zero_large";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         SkAutoTUnref<SkImageFilter> displ(SkNEW_ARGS(SkBitmapSource, (fCheckerboard)));
         // No displacement effect
         paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
             (SkDisplacementMapEffect::kR_ChannelSelectorType,
              SkDisplacementMapEffect::kG_ChannelSelectorType, 0.0f, displ)))->unref();
-        drawClippedBitmap(canvas, 0, 0, paint);
+
+        for (int i = 0; i < this->getLoops(); i++) {
+            drawClippedBitmap(canvas, 0, 0, paint);
+        }
     }
 
 private:
     typedef DisplacementBaseBench INHERITED;
 };
 
 class DisplacementAlphaBench : public DisplacementBaseBench {
 public:
     DisplacementAlphaBench(void* param, bool small) : INHERITED(param, small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return isSmall() ? "displacement_alpha_small" : "displacement_alpha_large";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         SkAutoTUnref<SkImageFilter> 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();
-        drawClippedBitmap(canvas, 100, 0, paint);
+        for (int i = 0; i < this->getLoops(); i++) {
+            drawClippedBitmap(canvas, 100, 0, paint);
+        }
     }
 
 private:
     typedef DisplacementBaseBench INHERITED;
 };
 
 class DisplacementFullBench : public DisplacementBaseBench {
 public:
     DisplacementFullBench(void* param, bool small) : INHERITED(param, small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return isSmall() ? "displacement_full_small" : "displacement_full_large";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         SkAutoTUnref<SkImageFilter> 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();
-        drawClippedBitmap(canvas, 200, 0, paint);
+        for (int i = 0; i < this->getLoops(); i++) {
+            drawClippedBitmap(canvas, 200, 0, paint);
+        }
     }
 
 private:
     typedef DisplacementBaseBench INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new DisplacementZeroBench(p, true); )
 DEF_BENCH( return new DisplacementAlphaBench(p, true); )
 DEF_BENCH( return new DisplacementFullBench(p, true); )
 DEF_BENCH( return new DisplacementZeroBench(p, false); )
 DEF_BENCH( return new DisplacementAlphaBench(p, false); )
 DEF_BENCH( return new DisplacementFullBench(p, false); )