Major bench refactoring.

bench/ChromeBench.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 "SkString.h"
@@ skipping 450 matching lines @@
 protected:
 
     virtual const char* onGetName() { return "chrome_scrollGmail"; }
     virtual void onDraw(SkCanvas* canvas) {
         SkDEBUGCODE(this->validateBounds(canvas));
         SkPaint paint;
         this->setupPaint(&paint);
         for (int i = 0; i < N; i++) {
             SkRect current;
             setRectangle(current, i);
-            for (int j = 0; j < SkBENCHLOOP(gmailScrollingRectSpec[i*3]); j++) {
+            for (int j = 0; j < this->getLoops() * gmailScrollingRectSpec[i*3]; j++) {
                 canvas->drawRect(current, paint);
             }
         }
     }
     virtual SkIPoint onGetSize() { return SkIPoint::Make(W, H); }
 
     void setRectangle(SkRect& current, int i) {
         current.set(0, 0,
                     SkIntToScalar(gmailScrollingRectSpec[i*3+1]), SkIntToScalar(gmailScrollingRectSpec[i*3+2]));
     }
     void validateBounds(SkCanvas* canvas) {
         SkIRect bounds;
         canvas->getClipDeviceBounds(&bounds);
         SkASSERT(bounds.right()-bounds.left() >= W);
         SkASSERT(bounds.bottom()-bounds.top() >= H);
     }
 
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 static inline SkBenchmark* ScrollGmailFactory(void* p) {
     return SkNEW_ARGS(ScrollGmailBench, (p));
 }
 
 // Disabled this benchmark: it takes 15x longer than any other benchmark
 // and is probably not giving us important information.
 //static BenchRegistry gScrollGmailReg(ScrollGmailFactory);