Simplify benchmark internal API.

bench/TextBench.cpp

 
 /*
  * Copyright 2011 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 "SkFontHost.h"
@@ skipping 73 matching lines @@
         }
         fName.appendf("_%s", fontQualityName(fPaint));
         if (SK_ColorBLACK != fPaint.getColor()) {
             fName.appendf("_%02X", fPaint.getAlpha());
         } else {
             fName.append("_BK");
         }
         return fName.c_str();
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
+    virtual void onDraw(const int loops, SkCanvas* canvas) {
         const SkIPoint dim = this->getSize();
         SkRandom rand;
 
         SkPaint paint(fPaint);
         this->setupPaint(&paint);
         // explicitly need these
         paint.setColor(fPaint.getColor());
         paint.setAntiAlias(kBW != fFQ);
         paint.setLCDRenderText(kLCD == fFQ);
 
         const SkScalar x0 = SkIntToScalar(-10);
         const SkScalar y0 = SkIntToScalar(-10);
 
         if (fDoPos) {
             // realistically, the matrix is often at least translated, so we
             // do that since it exercises different code in drawPosText.
             canvas->translate(SK_Scalar1, SK_Scalar1);
         }
 
-        for (int i = 0; i < this->getLoops(); i++) {
+        for (int i = 0; i < loops; i++) {
             if (fDoPos) {
                 canvas->drawPosText(fText.c_str(), fText.size(), fPos, paint);
             } else {
                 SkScalar x = x0 + rand.nextUScalar1() * dim.fX;
                 SkScalar y = y0 + rand.nextUScalar1() * dim.fY;
                 canvas->drawText(fText.c_str(), fText.size(), x, y, paint);
             }
         }
     }
 
@@ skipping 11 matching lines @@
 
 DEF_BENCH( return new TextBench(STR, 16, 0xFF000000, kAA); )
 DEF_BENCH( return new TextBench(STR, 16, 0xFFFF0000, kAA); )
 DEF_BENCH( return new TextBench(STR, 16, 0x88FF0000, kAA); )
 
 DEF_BENCH( return new TextBench(STR, 16, 0xFF000000, kLCD); )
 DEF_BENCH( return new TextBench(STR, 16, 0xFFFF0000, kLCD); )
 DEF_BENCH( return new TextBench(STR, 16, 0x88FF0000, kLCD); )
 
 DEF_BENCH( return new TextBench(STR, 16, 0xFF000000, kAA, true); )