Major bench refactoring.

bench/LineBench.cpp

 /*
  * Copyright 2012 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"
 #include "SkColorPriv.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkShader.h"
 #include "SkString.h"
 #include "SkTArray.h"
 
 
 class LineBench : public SkBenchmark {
     SkScalar    fStrokeWidth;
     bool        fDoAA;
     SkString    fName;
     enum {
         PTS = 500,
-        N = SkBENCHLOOP(10)
     };
     SkPoint fPts[PTS];
 
 public:
     LineBench(void* param, SkScalar width, bool doAA) : INHERITED(param) {
         fStrokeWidth = width;
         fDoAA = doAA;
         fName.printf("lines_%g_%s", width, doAA ? "AA" : "BW");
 
         SkRandom rand;
         for (int i = 0; i < PTS; ++i) {
             fPts[i].set(rand.nextUScalar1() * 640, rand.nextUScalar1() * 480);
         }
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         this->setupPaint(&paint);
 
         paint.setStyle(SkPaint::kStroke_Style);
         paint.setAntiAlias(fDoAA);
         paint.setStrokeWidth(fStrokeWidth);
 
-        for (int i = 0; i < N; i++) {
+        for (int i = 0; i < this->getLoops(); i++) {
             canvas->drawPoints(SkCanvas::kLines_PointMode, PTS, fPts, paint);
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 DEF_BENCH(return new LineBench(p, 0,            false);)
 DEF_BENCH(return new LineBench(p, SK_Scalar1,   false);)
 DEF_BENCH(return new LineBench(p, 0,            true);)
 DEF_BENCH(return new LineBench(p, SK_Scalar1/2, true);)
 DEF_BENCH(return new LineBench(p, SK_Scalar1,   true);)