Major bench refactoring.

bench/VertBench.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 "SkPaint.h"
 #include "SkRandom.h"
 #include "SkString.h"
 #include "SkShader.h"
 
 enum VertFlags {
     kColors_VertFlag,
     kTexture_VertFlag,
 };
 
 class VertBench : public SkBenchmark {
     SkString fName;
     enum {
         W = 640,
         H = 480,
         ROW = 20,
         COL = 20,
         PTS = (ROW + 1) * (COL + 1),
         IDX = ROW * COL * 6,
-        N = SkBENCHLOOP(10)
     };
 
     SkPoint fPts[PTS];
     SkColor fColors[PTS];
     uint16_t fIdx[IDX];
 
     static void load_2_tris(uint16_t idx[], int x, int y, int rb) {
         int n = y * rb + x;
         idx[0] = n; idx[1] = n + 1; idx[2] = rb + n + 1;
         idx[3] = n; idx[4] = rb + n + 1; idx[5] = n + rb;
@@ skipping 35 matching lines @@
 
         fName.set("verts");
     }
 
 protected:
     virtual const char* onGetName() { return fName.c_str(); }
     virtual void onDraw(SkCanvas* canvas) {
         SkPaint paint;
         this->setupPaint(&paint);
 
-        for (int i = 0; i < N; i++) {
+        for (int i = 0; i < this->getLoops(); i++) {
             canvas->drawVertices(SkCanvas::kTriangles_VertexMode, PTS,
                                  fPts, NULL, fColors, NULL, fIdx, IDX, paint);
         }
     }
 private:
     typedef SkBenchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static SkBenchmark* Fact(void* p) { return SkNEW_ARGS(VertBench, (p)); }
 
 static BenchRegistry gReg(Fact);