Major bench refactoring.

bench/BitmapScaleBench.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 57 matching lines @@
 
         fMatrix.setScale( scale(), scale() );
     }
 
     virtual void onDraw(SkCanvas*) {
         SkPaint paint;
         this->setupPaint(&paint);
 
         preBenchSetup();
 
-        for (int i = 0; i < SkBENCHLOOP(fLoopCount); i++) {
+        for (int i = 0; i < this->getLoops(); i++) {
             doScaleImage();
         }
     }
 
     virtual void doScaleImage() = 0;
     virtual void preBenchSetup() {}
 private:
     typedef SkBenchmark INHERITED;
 };
 
@@ skipping 16 matching lines @@
 
 DEF_BENCH(return new BitmapFilterScaleBench(p, 10, 90);)
 DEF_BENCH(return new BitmapFilterScaleBench(p, 30, 90);)
 DEF_BENCH(return new BitmapFilterScaleBench(p, 80, 90);)
 DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 90);)
 DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 80);)
 DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 30);)
 DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 10);)
 DEF_BENCH(return new BitmapFilterScaleBench(p, 256, 64);)
 DEF_BENCH(return new BitmapFilterScaleBench(p, 64, 256);)