Major bench refactoring.

bench/BlurRectBench.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"
@@ skipping 44 matching lines @@
         SkPaint paint;
         this->setupPaint(&paint);
 
         paint.setAntiAlias(true);
 
         SkScalar pad = fRadius*3/2 + SK_Scalar1;
         SkRect r = SkRect::MakeWH(2 * pad + SK_Scalar1, 2 * pad + SK_Scalar1);
 
         preBenchSetup(r);
 
-        for (int i = 0; i < SkBENCHLOOP(fLoopCount); i++) {
+        for (int i = 0; i < this->getLoops(); i++) {
             makeBlurryRect(r);
         }
     }
 
     virtual void makeBlurryRect(const SkRect&) = 0;
     virtual void preBenchSetup(const SkRect&) {}
 private:
     typedef SkBenchmark INHERITED;
 };
 
@@ skipping 144 matching lines @@
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(12));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(13));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(14));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(15));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(16));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(17));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(18));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(19));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(20));)
 #endif