Major bench refactoring.

bench/PathIterBench.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 12 matching lines @@
         pts[i].fY = rand.nextSScalar1();
     }
     return n;
 }
 
 class PathIterBench : public SkBenchmark {
     SkString    fName;
     SkPath      fPath;
     bool        fRaw;
 
-    enum { N = SkBENCHLOOP(500) };
-
 public:
     PathIterBench(void* param, bool raw) : INHERITED(param) {
         fName.printf("pathiter_%s", raw ? "raw" : "consume");
         fRaw = raw;
 
         SkRandom rand;
         for (int i = 0; i < 1000; ++i) {
             SkPoint pts[4];
             int n = rand_pts(rand, pts);
             switch (n) {
@@ skipping 15 matching lines @@
         fIsRendering = false;
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
     virtual void onDraw(SkCanvas*) SK_OVERRIDE {
         if (fRaw) {
-            for (int i = 0; i < N; ++i) {
+            for (int i = 0; i < this->getLoops(); ++i) {
                 SkPath::RawIter iter(fPath);
                 SkPath::Verb verb;
                 SkPoint      pts[4];
 
                 while ((verb = iter.next(pts)) != SkPath::kDone_Verb) { }
             }
         } else {
-            for (int i = 0; i < N; ++i) {
+            for (int i = 0; i < this->getLoops(); ++i) {
                 SkPath::Iter iter(fPath, false);
                 SkPath::Verb verb;
                 SkPoint      pts[4];
 
                 while ((verb = iter.next(pts)) != SkPath::kDone_Verb) { }
             }
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static SkBenchmark* F0(void* p) { return new PathIterBench(p, false); }
 static SkBenchmark* F1(void* p) { return new PathIterBench(p, true); }
 
 static BenchRegistry gR0(F0);
 static BenchRegistry gR1(F1);