Simplify benchmark internal API.

bench/PictureRecordBench.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 "SkColor.h"
 #include "SkPaint.h"
@@ skipping 32 matching lines @@
 /*
  *  An SkPicture has internal dictionaries to store bitmaps, matrices, paints,
  *  and regions.  This bench populates those dictionaries to test the speed of
  *  reading and writing to those particular dictionary data structures.
  */
 class DictionaryRecordBench : public PictureRecordBench {
 public:
     DictionaryRecordBench() : INHERITED("dictionaries") {}
 
 protected:
-    virtual void onDraw(SkCanvas*) SK_OVERRIDE {
+    virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
         SkAutoTDelete<SkPicture> picture;
         SkCanvas* canvas = NULL;
 
-        const SkPoint translateDelta = getTranslateDelta(this->getLoops());
+        const SkPoint translateDelta = getTranslateDelta(loops);
 
-        for (int i = 0; i < this->getLoops(); i++) {
+        for (int i = 0; i < loops; i++) {
             if (0 == i % kMaxLoopsPerCanvas) {
                 picture.reset(SkNEW(SkPicture));
                 canvas = picture->beginRecording(PICTURE_WIDTH, PICTURE_HEIGHT);
             }
 
             SkColor color = SK_ColorYELLOW + (i % 255);
             SkIRect rect = SkIRect::MakeWH(i % PICTURE_WIDTH, i % PICTURE_HEIGHT);
 
             canvas->save();
 
@@ skipping 40 matching lines @@
 
 /*
  *  Populates the SkPaint dictionary with a large number of unique paint
  *  objects that differ only by color
  */
 class UniquePaintDictionaryRecordBench : public PictureRecordBench {
 public:
     UniquePaintDictionaryRecordBench() : INHERITED("unique_paint_dictionary") { }
 
 protected:
-    virtual void onDraw(SkCanvas*) SK_OVERRIDE {
+    virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
         SkRandom rand;
         SkPaint paint;
         SkAutoTDelete<SkPicture> picture;
         SkCanvas* canvas = NULL;
-        for (int i = 0; i < this->getLoops(); i++) {
+        for (int i = 0; i < loops; i++) {
             if (0 == i % kMaxLoopsPerCanvas) {
                 picture.reset(SkNEW(SkPicture));
                 canvas = picture->beginRecording(PICTURE_WIDTH, PICTURE_HEIGHT);
             }
             paint.setColor(rand.nextU());
             canvas->drawPaint(paint);
         }
     }
 
 private:
@@ skipping 14 matching lines @@
         SkRandom rand;
         for (int i = 0; i < ObjCount; i++) {
             fPaint[i].setColor(rand.nextU());
         }
     }
 
     enum {
         ObjCount = 100,  // number of unique paint objects
     };
 protected:
-    virtual void onDraw(SkCanvas*) SK_OVERRIDE {
+    virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
         SkPicture picture;
         SkCanvas* canvas = picture.beginRecording(PICTURE_WIDTH, PICTURE_HEIGHT);
-        for (int i = 0; i < this->getLoops(); i++) {
+        for (int i = 0; i < loops; i++) {
             canvas->drawPaint(fPaint[i % ObjCount]);
         }
     }
 
 private:
     SkPaint fPaint [ObjCount];
     typedef PictureRecordBench INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new DictionaryRecordBench(); )
 DEF_BENCH( return new UniquePaintDictionaryRecordBench(); )
 DEF_BENCH( return new RecurringPaintDictionaryRecordBench(); )