Simplify benchmark internal API.

bench/MemoryBench.cpp

 /*
  * Copyright 2012 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 12 matching lines @@
 
     virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == kNonRendering_Backend;
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
-    virtual void onDraw(SkCanvas*) SK_OVERRIDE {
+    virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
         size_t inc = fMinSize >> 4;
         SkASSERT(inc > 0);
         size_t total = fMinSize * 64;
 
         SkChunkAlloc alloc(fMinSize);
 
-        for (int i = 0; i < this->getLoops(); ++i) {
+        for (int i = 0; i < loops; ++i) {
             size_t size = 0;
             int calls = 0;
             while (size < total) {
                 alloc.allocThrow(inc);
                 size += inc;
                 calls += 1;
             }
             alloc.reset();
         }
     }
@@ skipping 41 matching lines @@
 
     virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == kNonRendering_Backend;
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
-    virtual void onDraw(SkCanvas*) SK_OVERRIDE {
-        for (int i = 0; i < this->getLoops(); i++) {
+    virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
+        for (int i = 0; i < loops; i++) {
             int* zeros = fUseCalloc ? calloc(fNum) : malloc_bzero(fNum);
             if (fRead) {
                 volatile int x = 15;
                 for (size_t j = 0; j < fNum; j++) {
                     x ^= zeros[j];
                 }
             }
             if (fWrite) {
                 for (size_t j = 0; j < fNum; j++) {
                     zeros[j] = 15;
@@ skipping 42 matching lines @@
 DEF_BENCH(return new ZerosBench(300, 1, 1, 1))
 
 DEF_BENCH(return new ZerosBench(4, 0, 0, 0))
 DEF_BENCH(return new ZerosBench(4, 0, 0, 1))
 DEF_BENCH(return new ZerosBench(4, 0, 1, 0))
 DEF_BENCH(return new ZerosBench(4, 0, 1, 1))
 DEF_BENCH(return new ZerosBench(4, 1, 0, 0))
 DEF_BENCH(return new ZerosBench(4, 1, 0, 1))
 DEF_BENCH(return new ZerosBench(4, 1, 1, 0))
 DEF_BENCH(return new ZerosBench(4, 1, 1, 1))