Major bench refactoring.

bench/FSRectBench.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"
@@ skipping 26 matching lines @@
                 fRects[i].fRight = W + kMinOffset + SkScalarMul(rand.nextUScalar1(), kOffsetRange);
                 fRects[i].fBottom = H + kMinOffset + SkScalarMul(rand.nextUScalar1(), kOffsetRange);
                 fColors[i] = rand.nextU() | 0xFF000000;
             }
             fInit = true;
         }
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
-        for (int i = 0; i < N; ++i) {
-            paint.setColor(fColors[i]);
-            canvas->drawRect(fRects[i], paint);
+        for (int i = 0; i < this->getLoops(); ++i) {
+            paint.setColor(fColors[i % N]);
+            canvas->drawRect(fRects[i % N], paint);
         }
     }
 
 private:
     enum {
         W = 640,
         H = 480,
-        N = SkBENCHLOOP(300)
+        N = 300,
     };
     SkRect  fRects[N];
     SkColor fColors[N];
     bool fInit;
 
     typedef SkBenchmark INHERITED;
 };
 
 DEF_BENCH( return SkNEW_ARGS(FSRectBench, (p)); )