Simplify benchmark internal API.

bench/AAClipBench.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 "SkAAClip.h"
 #include "SkPath.h"
@@ skipping 25 matching lines @@
                       50.5f, 50.5f);
         fClipPath.addRoundRect(fClipRect, SkIntToScalar(10), SkIntToScalar(10));
         fDrawRect.set(SkIntToScalar(0), SkIntToScalar(0),
                       SkIntToScalar(100), SkIntToScalar(100));
 
         SkASSERT(fClipPath.isConvex());
     }
 
 protected:
     virtual const char* onGetName() { return fName.c_str(); }
-    virtual void onDraw(SkCanvas* canvas) {
+    virtual void onDraw(const int loops, SkCanvas* canvas) {
 
         SkPaint paint;
         this->setupPaint(&paint);
 
-        for (int i = 0; i < this->getLoops(); ++i) {
+        for (int i = 0; i < loops; ++i) {
             // jostle the clip regions each time to prevent caching
             fClipRect.offset((i % 2) == 0 ? SkIntToScalar(10) : SkIntToScalar(-10), 0);
             fClipPath.reset();
             fClipPath.addRoundRect(fClipRect,
                                    SkIntToScalar(5), SkIntToScalar(5));
             SkASSERT(fClipPath.isConvex());
 
             canvas->save();
 #if 1
             if (fDoPath) {
@@ skipping 89 matching lines @@
                 this->recurse(canvas, depth+1, childOffset);
 
                 childOffset.fX = offset.fX;
                 childOffset.fY = offset.fY + fSizes[depth+1].fY;
                 this->recurse(canvas, depth+1, childOffset);
             }
 
             canvas->restore();
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
+    virtual void onDraw(const int loops, SkCanvas* canvas) {
 
-        for (int i = 0; i < this->getLoops(); ++i) {
+        for (int i = 0; i < loops; ++i) {
             SkPoint offset = SkPoint::Make(0, 0);
             this->recurse(canvas, 0, offset);
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 14 matching lines @@
                      doAA ? "AA" : "BW");
 
         fRegion.setRect(0, 0, 640, 480);
         fRect.set(fRegion.getBounds());
         fRect.inset(SK_Scalar1/4, SK_Scalar1/4);
         fPath.addRoundRect(fRect, SkIntToScalar(20), SkIntToScalar(20));
     }
 
 protected:
     virtual const char* onGetName() { return fName.c_str(); }
-    virtual void onDraw(SkCanvas*) {
+    virtual void onDraw(const int loops, SkCanvas*) {
         SkPaint paint;
         this->setupPaint(&paint);
 
-        for (int i = 0; i < this->getLoops(); ++i) {
+        for (int i = 0; i < loops; ++i) {
             SkAAClip clip;
             if (fDoPath) {
                 clip.setPath(fPath, &fRegion, fDoAA);
             } else {
                 clip.setRect(fRect, fDoAA);
             }
         }
     }
 private:
     typedef SkBenchmark INHERITED;
@@ skipping 10 matching lines @@
         // evenodd means we've constructed basically a stroked circle
         path.setFillType(SkPath::kEvenOdd_FillType);
 
         SkIRect bounds;
         path.getBounds().roundOut(&bounds);
         fRegion.setPath(path, SkRegion(bounds));
     }
 
 protected:
     virtual const char* onGetName() { return "aaclip_setregion"; }
-    virtual void onDraw(SkCanvas*) {
-        for (int i = 0; i < this->getLoops(); ++i) {
+    virtual void onDraw(const int loops, SkCanvas*) {
+        for (int i = 0; i < loops; ++i) {
             SkAAClip clip;
             clip.setRegion(fRegion);
         }
     }
 
 private:
     SkRegion fRegion;
     typedef SkBenchmark INHERITED;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return SkNEW_ARGS(AAClipBuilderBench, (false, false)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBuilderBench, (false, true)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBuilderBench, (true, false)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBuilderBench, (true, true)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipRegionBench, ()); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBench, (false, false)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBench, (false, true)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBench, (true, false)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBench, (true, true)); )
 DEF_BENCH( return SkNEW_ARGS(NestedAAClipBench, (false)); )
 DEF_BENCH( return SkNEW_ARGS(NestedAAClipBench, (true)); )