Simplify benchmark internal API.

bench/SkipZeroesBench.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 54 matching lines @@
                 fDecoder.reset(SkImageDecoder::Factory(&fStream));
                 if (fDecoder.get()) {
                     fDecoder->setSkipWritingZeroes(fSkipZeroes);
                 } else {
                     fValid = false;
                 }
             }
         }
     }
 
-    virtual void onDraw(SkCanvas*) SK_OVERRIDE {
+    virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
         if (!fValid) {
 #ifdef SK_DEBUG
             SkDebugf("stream was invalid: %s\n", fFilename.c_str());
 #endif
             return;
         }
         // Decode a bunch of times
         SkBitmap bm;
-        for (int i = 0; i < this->getLoops(); ++i) {
+        for (int i = 0; i < loops; ++i) {
             SkDEBUGCODE(bool success =) fDecoder->decode(&fStream, &bm,
                                                          SkImageDecoder::kDecodePixels_Mode);
 #ifdef SK_DEBUG
             if (!success) {
                 SkDebugf("failed to decode %s\n", fFilename.c_str());
                 return;
             }
 #endif
             SkDEBUGCODE(success =) fStream.rewind();
 #ifdef SK_DEBUG
@@ skipping 12 matching lines @@
     SkMemoryStream                  fStream;
     bool                            fSkipZeroes;
     bool                            fValid;
 
     typedef SkBenchmark INHERITED;
 };
 
 // Enable the true version once the feature is checked in.
 DEF_BENCH( return SkNEW_ARGS(SkipZeroesBench, ("arrow.png", true)));
 DEF_BENCH( return SkNEW_ARGS(SkipZeroesBench, ("arrow.png", false)));