Major bench refactoring.

bench/RectoriBench.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 "SkPaint.h"
 #include "SkRandom.h"
 #include "SkBlurMaskFilter.h"
 #include "SkLayerDrawLooper.h"
 
 // This bench replicates a problematic use case of a draw looper used
 // to create an inner blurred rect
 class RectoriBench : public SkBenchmark {
 public:
     RectoriBench(void* param) : INHERITED(param) {}
 
 protected:
 
     virtual const char* onGetName() {
         return "rectori";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkMWCRandom Random;
 
-        for (int i = 0; i < N; i++) {
+        for (int i = 0; i < this->getLoops(); i++) {
             SkScalar blurRad = Random.nextRangeScalar(1.5f, 25.0f);
             SkScalar size = Random.nextRangeScalar(20*blurRad, 50*blurRad);
 
             SkScalar x = Random.nextRangeScalar(0.0f, W - size);
             SkScalar y = Random.nextRangeScalar(0.0f, H - size);
 
             SkRect inner = { x, y, x + size, y + size };
 
             SkRect outer(inner);
             // outer is always outset either 2x or 4x the blur radius (we go with 2x)
@@ skipping 22 matching lines @@
             canvas->restore();
         }
     }
 
 private:
     enum {
         W = 640,
         H = 480,
     };
 
-    enum { N = SkBENCHLOOP(100) };
-
     SkLayerDrawLooper* createLooper(SkScalar xOff, SkScalar radius) {
         SkLayerDrawLooper* looper = new SkLayerDrawLooper;
 
         //-----------------------------------------------
         SkLayerDrawLooper::LayerInfo info;
 
         info.fFlagsMask = 0;
         // TODO: add a color filter to better match what is seen in the wild
         info.fPaintBits = /* SkLayerDrawLooper::kColorFilter_Bit |*/
                           SkLayerDrawLooper::kMaskFilter_Bit;
@@ skipping 14 matching lines @@
 
         paint = looper->addLayer(info);
         return looper;
     }
 
     typedef SkBenchmark INHERITED;
 };
 
 
 DEF_BENCH( return SkNEW_ARGS(RectoriBench, (p)); )