Simplify benchmark internal API.

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"
 #include "SkPaint.h"
@@ skipping 84 matching lines @@
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         if (fAA) {
             return "chart_aa";
         } else {
             return "chart_bw";
         }
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         bool sizeChanged = false;
         if (canvas->getDeviceSize() != fSize) {
             fSize = canvas->getDeviceSize();
             sizeChanged = true;
         }
 
         SkScalar ySpread = SkIntToScalar(fSize.fHeight / 20);
 
         SkScalar height = SkIntToScalar(fSize.fHeight);
         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 < this->getLoops(); ++frame) {
+        for (int frame = 0; frame < loops; ++frame) {
 
             canvas->clear(0xFFE0F0E0);
 
             static SkRandom colorRand;
             static SkColor gColors[kNumGraphs] = { 0x0 };
             if (0 == gColors[0]) {
                 for (int i = 0; i < kNumGraphs; ++i) {
                     gColors[i] = colorRand.nextU() | 0xff000000;
                 }
             }
@@ skipping 48 matching lines @@
     SkTDArray<SkScalar> fData[kNumGraphs];
     bool                fAA;
 
     typedef SkBenchmark INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new ChartBench(true); )
 DEF_BENCH( return new ChartBench(false); )