Major bench refactoring.

bench/ChartBench.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 109 matching lines @@
         if (sizeChanged) {
             int dataPointCount = SkMax32(fSize.fWidth / kPixelsPerTick + 1, 2);
 
             for (int i = 0; i < kNumGraphs; ++i) {
                 SkScalar y = (kNumGraphs - i) * (height - ySpread) / (kNumGraphs + 1);
                 fData[i].reset();
                 gen_data(y, ySpread, dataPointCount, fData + i);
             }
         }
 
-        for (int frame = 0; frame < kFramesPerRun; ++frame) {
+        for (int frame = 0; frame < this->getLoops(); ++frame) {
 
             canvas->clear(0xFFE0F0E0);
 
             static SkMWCRandom colorRand;
             static SkColor gColors[kNumGraphs] = { 0x0 };
             if (0 == gColors[0]) {
                 for (int i = 0; i < kNumGraphs; ++i) {
                     gColors[i] = colorRand.nextU() | 0xff000000;
                 }
             }
@@ skipping 35 matching lines @@
 
             fShift += kShiftPerFrame;
         }
     }
 
 private:
     enum {
         kNumGraphs = 5,
         kPixelsPerTick = 3,
         kShiftPerFrame = 1,
-
-        kFramesPerRun = SkBENCHLOOP(5),
     };
     int                 fShift;
     SkISize             fSize;
     SkTDArray<SkScalar> fData[kNumGraphs];
     bool                fAA;
 
     typedef SkBenchmark INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkBenchmark* Fact0(void* p) { return new ChartBench(p, true); }
 static SkBenchmark* Fact1(void* p) { return new ChartBench(p, false); }
 
 static BenchRegistry gReg0(Fact0);
 static BenchRegistry gReg1(Fact1);