Major bench refactoring.

bench/TextBench.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 "SkFontHost.h"
@@ skipping 27 matching lines @@
         textencoding?
         text -vs- postext - pathtext
  */
 class TextBench : public SkBenchmark {
     SkPaint     fPaint;
     SkString    fText;
     SkString    fName;
     FontQuality fFQ;
     bool        fDoPos;
     SkPoint*    fPos;
-    enum { N = SkBENCHLOOP(800) };
 public:
     TextBench(void* param, const char text[], int ps,
               SkColor color, FontQuality fq, bool doPos = false) : INHERITED(param) {
         fPos = NULL;
         fFQ = fq;
         fDoPos = doPos;
         fText.set(text);
 
         fPaint.setAntiAlias(kBW != fq);
         fPaint.setLCDRenderText(kLCD == fq);
@@ skipping 46 matching lines @@
 
         const SkScalar x0 = SkIntToScalar(-10);
         const SkScalar y0 = SkIntToScalar(-10);
 
         if (fDoPos) {
             // realistically, the matrix is often at least translated, so we
             // do that since it exercises different code in drawPosText.
             canvas->translate(SK_Scalar1, SK_Scalar1);
         }
 
-        for (int i = 0; i < N; i++) {
+        for (int i = 0; i < this->getLoops(); i++) {
             if (fDoPos) {
                 canvas->drawPosText(fText.c_str(), fText.size(), fPos, paint);
             } else {
                 SkScalar x = x0 + rand.nextUScalar1() * dim.fX;
                 SkScalar y = y0 + rand.nextUScalar1() * dim.fY;
                 canvas->drawText(fText.c_str(), fText.size(), x, y, paint);
             }
         }
     }
 
@@ skipping 25 matching lines @@
 
 static BenchRegistry gReg11(Fact11);
 static BenchRegistry gReg12(Fact12);
 static BenchRegistry gReg13(Fact13);
 
 static BenchRegistry gReg21(Fact21);
 static BenchRegistry gReg22(Fact22);
 static BenchRegistry gReg23(Fact23);
 
 static BenchRegistry gReg111(Fact111);