Simplify benchmark internal API.

bench/GameBench.cpp

 /*
  * Copyright 2012 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 68 matching lines @@
     }
 
     virtual void onPreDraw() SK_OVERRIDE {
         if (!fInitialized) {
             this->makeCheckerboard();
             this->makeAtlas();
             fInitialized = true;
         }
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkRandom scaleRand;
         SkRandom transRand;
         SkRandom rotRand;
 
         int width, height;
         if (fUseAtlas) {
             width = kAtlasCellWidth;
             height = kAtlasCellHeight;
         } else {
             width = kCheckerboardWidth;
@@ skipping 36 matching lines @@
         p.setColor(0xFF000000);
         p.setFilterLevel(SkPaint::kLow_FilterLevel);
 
         SkPaint p2;         // for drawVertices path
         p2.setColor(0xFF000000);
         p2.setFilterLevel(SkPaint::kLow_FilterLevel);
         p2.setShader(SkShader::CreateBitmapShader(fAtlas,
                                                   SkShader::kClamp_TileMode,
                                                   SkShader::kClamp_TileMode))->unref();
 
-        for (int i = 0; i < this->getLoops(); ++i, ++fNumSaved) {
+        for (int i = 0; i < loops; ++i, ++fNumSaved) {
             if (0 == i % kNumBeforeClear) {
                 if (kPartial_Clear == fClear) {
                     for (int j = 0; j < fNumSaved; ++j) {
                         canvas->setMatrix(SkMatrix::I());
                         mat.setTranslate(fSaved[j][0], fSaved[j][1]);
 
                         if (kScale_Type == fType) {
                             mat.preScale(fSaved[j][2], fSaved[j][2]);
                         } else if (kRotate_Type == fType) {
                             mat.preRotate(fSaved[j][2]);
@@ skipping 172 matching lines @@
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type,
                                             GameBench::kFull_Clear, true)); )
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kRotate_Type,
                                             GameBench::kFull_Clear)); )
 
 // Atlased
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type,
                                             GameBench::kFull_Clear, false, true)); )
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type,
                                             GameBench::kFull_Clear, false, true, true)); )