Simplify benchmark internal API.

bench/DashBench.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 "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 43 matching lines @@
 
     virtual void makePath(SkPath* path) {
         path_hline(path);
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         this->setupPaint(&paint);
         paint.setStyle(SkPaint::kStroke_Style);
         paint.setStrokeWidth(SkIntToScalar(fWidth));
         paint.setAntiAlias(false);
 
         SkPath path;
         this->makePath(&path);
 
         paint.setPathEffect(new SkDashPathEffect(fIntervals.begin(),
                                                  fIntervals.count(), 0))->unref();
 
         if (fDoClip) {
             SkRect r = path.getBounds();
             r.inset(-SkIntToScalar(20), -SkIntToScalar(20));
             // now move it so we don't intersect
             r.offset(0, r.height() * 3 / 2);
             canvas->clipRect(r);
         }
 
-        this->handlePath(canvas, path, paint, this->getLoops());
+        this->handlePath(canvas, path, paint, loops);
     }
 
     virtual void handlePath(SkCanvas* canvas, const SkPath& path,
                             const SkPaint& paint, int N) {
         for (int i = 0; i < N; ++i) {
 //            canvas->drawPoints(SkCanvas::kLines_PointMode, 2, fPts, paint);
             canvas->drawPath(path, paint);
         }
     }
 
@@ skipping 91 matching lines @@
 
         SkScalar vals[] = { SkIntToScalar(4), SkIntToScalar(4) };
         fPE.reset(new SkDashPathEffect(vals, 2, 0));
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
-    virtual void onDraw(SkCanvas*) SK_OVERRIDE {
+    virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
         SkPath dst;
-        for (int i = 0; i < this->getLoops(); ++i) {
+        for (int i = 0; i < loops; ++i) {
             SkStrokeRec rec(SkStrokeRec::kHairline_InitStyle);
 
             fPE->filterPath(&dst, fPath, &rec, NULL);
             dst.rewind();
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
@@ skipping 15 matching lines @@
 
         SkScalar vals[] = { SK_Scalar1, SK_Scalar1 };
         fPE.reset(new SkDashPathEffect(vals, 2, 0));
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         this->setupPaint(&paint);
         paint.setStrokeWidth(fStrokeWidth);
         paint.setStrokeCap(fIsRound ? SkPaint::kRound_Cap : SkPaint::kSquare_Cap);
         paint.setPathEffect(fPE);
-        for (int i = 0; i < this->getLoops(); ++i) {
+        for (int i = 0; i < loops; ++i) {
             canvas->drawLine(10 * SK_Scalar1, 10 * SK_Scalar1,
                              640 * SK_Scalar1, 10 * SK_Scalar1, paint);
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 class DrawPointsDashingBench : public SkBenchmark {
@@ skipping 12 matching lines @@
 
         SkScalar vals[] = { SkIntToScalar(dashLength), SkIntToScalar(dashLength) };
         fPathEffect.reset(new SkDashPathEffect(vals, 2, SK_Scalar1, false));
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkPaint p;
         this->setupPaint(&p);
         p.setColor(SK_ColorBLACK);
         p.setStyle(SkPaint::kStroke_Style);
         p.setStrokeWidth(SkIntToScalar(fStrokeWidth));
         p.setPathEffect(fPathEffect);
         p.setAntiAlias(fDoAA);
 
         SkPoint pts[2] = {
             { SkIntToScalar(10), 0 },
             { SkIntToScalar(640), 0 }
         };
 
-        for (int i = 0; i < this->getLoops(); ++i) {
+        for (int i = 0; i < loops; ++i) {
             pts[0].fY = pts[1].fY = SkIntToScalar(i % 480);
             canvas->drawPoints(SkCanvas::kLines_PointMode, 2, pts, p);
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 // Want to test how we handle dashing when 99% of the dash is clipped out
@@ skipping 51 matching lines @@
             { -overshoot, cy }, { 640 + overshoot, cy }
         };
         matrix.mapPoints(fPts, pts, 2);
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkPaint p;
         this->setupPaint(&p);
         p.setStyle(SkPaint::kStroke_Style);
         p.setStrokeWidth(fStrokeWidth);
         p.setPathEffect(fPathEffect);
 
-        for (int i = 0; i < this->getLoops(); i++) {
+        for (int i = 0; i < loops; i++) {
             canvas->drawPoints(SkCanvas::kLines_PointMode, 2, fPts, p);
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 31 matching lines @@
 DEF_BENCH( return new GiantDashBench(GiantDashBench::kVert_LineType, 0); )
 DEF_BENCH( return new GiantDashBench(GiantDashBench::kDiag_LineType, 0); )
 
 // pass 2 to explicitly avoid any 1-is-the-same-as-hairline special casing
 
 // hori_2 is just too slow to enable at the moment
 DEF_BENCH( return new GiantDashBench(GiantDashBench::kHori_LineType, 2); )
 DEF_BENCH( return new GiantDashBench(GiantDashBench::kVert_LineType, 2); )
 DEF_BENCH( return new GiantDashBench(GiantDashBench::kDiag_LineType, 2); )
 #endif