Major bench refactoring.

bench/PathUtilsBench.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 "SkPathUtils.h"
 #include "SkRandom.h"
@@ skipping 23 matching lines @@
 }
 
 /// Emulates the mix of rects blitted by gmail during scrolling
 class PathUtilsBench : public SkBenchmark {
     typedef void (*Proc)(char*, SkPath*);
 
     Proc fProc;
     SkString fName;
     char* bits[H * STRIDE];
 
-    enum { N = SkBENCHLOOP(20) };
-
 public:
     PathUtilsBench(void* param, Proc proc, const char name[]) : INHERITED(param) {
         fProc = proc;
         fName.printf("pathUtils_%s", name);
 
 
     }
 
 protected:
     virtual const char* onGetName() { return fName.c_str(); }
 
     virtual void onDraw(SkCanvas* canvas) {
 
-        for (int i = 0; i < N; ++i){
+        for (int i = 0; i < this->getLoops(); ++i){
             //create a random 16x16 bitmap
             fillRandomBits(H * STRIDE, (char*) &bits);
 
             //use passed function pointer to handle it
             SkPath path;
             fProc( (char*) &bits, &path);
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 static SkBenchmark* PU_path(void* p) { return SkNEW_ARGS(PathUtilsBench, (p, path_proc, "path")); }
 static SkBenchmark* PU_region(void* p) { return SkNEW_ARGS(PathUtilsBench, (p, region_proc, "region")); }
 
 static BenchRegistry PU_Path(PU_path);
 static BenchRegistry PU_Region(PU_region);