Major bench refactoring.

bench/StrokeBench.cpp

 /*
  * Copyright 2013 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"
@@ skipping 40 matching lines @@
 // Handles rect, rrect, and oval
 //
 // Test drawing a small stroked version to see the effect of special-casing
 // our stroke code for these convex single-contour shapes.
 //
 class StrokeRRectBench : public SkBenchmark {
     SkString fName;
     SkPaint::Join fJoin;
     RRectRec fRec;
     DrawProc fProc;
-    enum { N = SkBENCHLOOP(500) };
 public:
     StrokeRRectBench(void* param, SkPaint::Join j, DrawProc proc) : SkBenchmark(param) {
         static const char* gJoinName[] = {
             "miter", "round", "bevel"
         };
 
         fJoin = j;
         fProc = proc;
         fName.printf("draw_stroke_%s_%s", proc(NULL, 0), gJoinName[j]);
 
         SkRect r = { 20, 20, 40, 40 };
         SkScalar rad = 4;
         fRec.fRRect.setRectXY(r, rad, rad);
     }
 
 protected:
     virtual const char* onGetName() {
         return fName.c_str();
     }
 
     virtual void onDraw(SkCanvas* canvas) {
         fRec.fCanvas = canvas;
         this->setupPaint(&fRec.fPaint);
         fRec.fPaint.setStyle(SkPaint::kStroke_Style);
         fRec.fPaint.setStrokeJoin(fJoin);
         fRec.fPaint.setStrokeWidth(5);
-        fProc(&fRec, N);
+        fProc(&fRec, this->getLoops());
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 DEF_BENCH( return new StrokeRRectBench(p, SkPaint::kRound_Join, draw_rect); )
 DEF_BENCH( return new StrokeRRectBench(p, SkPaint::kBevel_Join, draw_rect); )
 DEF_BENCH( return new StrokeRRectBench(p, SkPaint::kMiter_Join, draw_rect); )
 
 DEF_BENCH( return new StrokeRRectBench(p, SkPaint::kRound_Join, draw_rrect); )
 DEF_BENCH( return new StrokeRRectBench(p, SkPaint::kBevel_Join, draw_rrect); )
 DEF_BENCH( return new StrokeRRectBench(p, SkPaint::kMiter_Join, draw_rrect); )
 
 DEF_BENCH( return new StrokeRRectBench(p, SkPaint::kRound_Join, draw_oval); )
 DEF_BENCH( return new StrokeRRectBench(p, SkPaint::kBevel_Join, draw_oval); )
 DEF_BENCH( return new StrokeRRectBench(p, SkPaint::kMiter_Join, draw_oval); )