Major bench refactoring.

bench/ImageDecodeBench.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 "SkBitmap.h"
 #include "SkData.h"
@@ skipping 41 matching lines @@
 
     virtual void onDraw(SkCanvas*) SK_OVERRIDE {
 #ifdef SK_DEBUG
         if (!fValid) {
             SkDebugf("stream was invalid: %s\n", fName.c_str());
             return;
         }
 #endif
         // Decode a bunch of times
         SkBitmap bm;
-        for (int i = 0; i < SkBENCHLOOP(1000); ++i) {
+        for (int i = 0; i < this->getLoops(); ++i) {
             SkDEBUGCODE(bool success =) SkImageDecoder::DecodeStream(&fStream, &bm);
 #ifdef SK_DEBUG
             if (!success) {
                 SkDebugf("failed to decode %s\n", fName.c_str());
                 return;
             }
 #endif
             SkDEBUGCODE(success =) fStream.rewind();
 #ifdef SK_DEBUG
             if (!success) {
                 SkDebugf("failed to rewind %s\n", fName.c_str());
                 return;
             }
 #endif
         }
     }
 
 private:
     SkString        fName;
     const SkString  fFilename;
     SkMemoryStream  fStream;
     bool            fValid;
 
     typedef SkBenchmark INHERITED;
 };
 
 // These are files which call decodePalette
 //DEF_BENCH( return SkNEW_ARGS(ImageDecodeBench, (p, "/usr/local/google/home/scroggo/Downloads/images/hal_163x90.png")); )
 //DEF_BENCH( return SkNEW_ARGS(ImageDecodeBench, (p, "/usr/local/google/home/scroggo/Downloads/images/box_19_top-left.png")); )