Simplify benchmark internal API.

bench/XfermodeBench.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 "SkCanvas.h"
@@ skipping 13 matching lines @@
 
     XfermodeBench(SkXfermode* xferMode, const char* name) {
         SkASSERT(NULL != xferMode);
         fXfermode.reset(xferMode);
         fName.printf("Xfermode_%s", name);
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE { return fName.c_str(); }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkISize size = canvas->getDeviceSize();
         SkRandom random;
-        for (int i = 0; i < this->getLoops(); ++i) {
+        for (int i = 0; i < loops; ++i) {
             SkPaint paint;
             paint.setXfermode(fXfermode.get());
             paint.setColor(random.nextU());
             SkScalar w = random.nextRangeScalar(SkIntToScalar(kMinSize), SkIntToScalar(kMaxSize));
             SkScalar h = random.nextRangeScalar(SkIntToScalar(kMinSize), SkIntToScalar(kMaxSize));
             SkRect rect = SkRect::MakeXYWH(
                 random.nextUScalar1() * (size.fWidth - w),
                 random.nextUScalar1() * (size.fHeight - h),
                 w,
                 h
@@ skipping 15 matching lines @@
 
 class XferCreateBench : public SkBenchmark {
 public:
     virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == kNonRendering_Backend;
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE { return "xfermode_create"; }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        for (int outer = 0; outer < this->getLoops() * 10; ++outer) {
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+        for (int outer = 0; outer < loops * 10; ++outer) {
             for (int i = 0; i <= SkXfermode::kLastMode; ++i) {
                 SkXfermode* xfer = SkXfermode::Create(SkXfermode::Mode(i));
                 SkSafeUnref(xfer);
             }
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
@@ skipping 33 matching lines @@
 BENCH(SkXfermode::kDifference_Mode)
 BENCH(SkXfermode::kExclusion_Mode)
 BENCH(SkXfermode::kMultiply_Mode)
 
 BENCH(SkXfermode::kHue_Mode)
 BENCH(SkXfermode::kSaturation_Mode)
 BENCH(SkXfermode::kColor_Mode)
 BENCH(SkXfermode::kLuminosity_Mode)
 
 DEF_BENCH(return new XferCreateBench;)