Simplify benchmark internal API.

bench/LightingBench.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 "SkBitmapSource.h"
 #include "SkCanvas.h"
 #include "SkDevice.h"
 #include "SkLightingImageFilter.h"
 
 #define FILTER_WIDTH_SMALL  SkIntToScalar(32)
 #define FILTER_HEIGHT_SMALL SkIntToScalar(32)
 #define FILTER_WIDTH_LARGE  SkIntToScalar(256)
 #define FILTER_HEIGHT_LARGE SkIntToScalar(256)
 
 class LightingBaseBench : public SkBenchmark {
 public:
     LightingBaseBench(bool small) : fIsSmall(small) { }
 
 protected:
-    void draw(SkCanvas* canvas, SkImageFilter* imageFilter) const {
+    void draw(const int loops, SkCanvas* canvas, SkImageFilter* imageFilter) const {
         SkRect r = fIsSmall ? SkRect::MakeWH(FILTER_WIDTH_SMALL, FILTER_HEIGHT_SMALL) :
                               SkRect::MakeWH(FILTER_WIDTH_LARGE, FILTER_HEIGHT_LARGE);
         SkPaint paint;
         paint.setImageFilter(imageFilter)->unref();
-        for (int i = 0; i < this->getLoops(); i++) {
+        for (int i = 0; i < loops; i++) {
             canvas->drawRect(r, paint);
         }
     }
 
     static SkPoint3 getPointLocation() {
         static SkPoint3 pointLocation(0, 0, SkIntToScalar(10));
         return pointLocation;
     }
 
     static SkPoint3 getDistantDirection() {
@@ skipping 59 matching lines @@
 class LightingPointLitDiffuseBench : public LightingBaseBench {
 public:
     LightingPointLitDiffuseBench(bool small) : INHERITED(small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fIsSmall ? "lightingpointlitdiffuse_small" : "lightingpointlitdiffuse_large";
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        draw(canvas, SkLightingImageFilter::CreatePointLitDiffuse(getPointLocation(), getWhite(),
-            getSurfaceScale(), getKd()));
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+        draw(loops, canvas, SkLightingImageFilter::CreatePointLitDiffuse(getPointLocation(),
+                                                                         getWhite(),
+                                                                         getSurfaceScale(),
+                                                                         getKd()));
     }
 
 private:
     typedef LightingBaseBench INHERITED;
 };
 
 class LightingDistantLitDiffuseBench : public LightingBaseBench {
 public:
     LightingDistantLitDiffuseBench(bool small) : INHERITED(small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fIsSmall ? "lightingdistantlitdiffuse_small" : "lightingdistantlitdiffuse_large";
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        draw(canvas, SkLightingImageFilter::CreateDistantLitDiffuse(getDistantDirection(),
-            getWhite(), getSurfaceScale(), getKd()));
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+        draw(loops, canvas, SkLightingImageFilter::CreateDistantLitDiffuse(getDistantDirection(),
+                                                                           getWhite(),
+                                                                           getSurfaceScale(),
+                                                                           getKd()));
     }
 
 private:
     typedef LightingBaseBench INHERITED;
 };
 
 class LightingSpotLitDiffuseBench : public LightingBaseBench {
 public:
     LightingSpotLitDiffuseBench(bool small) : INHERITED(small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fIsSmall ? "lightingspotlitdiffuse_small" : "lightingspotlitdiffuse_large";
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        draw(canvas, SkLightingImageFilter::CreateSpotLitDiffuse(getSpotLocation(),
-            getSpotTarget(), getSpotExponent(), getCutoffAngle(), getWhite(), getSurfaceScale(),
-            getKd()));
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+        draw(loops, canvas, SkLightingImageFilter::CreateSpotLitDiffuse(getSpotLocation(),
+                                                                        getSpotTarget(),
+                                                                        getSpotExponent(),
+                                                                        getCutoffAngle(),
+                                                                        getWhite(),
+                                                                        getSurfaceScale(),
+                                                                        getKd()));
     }
 
 private:
     typedef LightingBaseBench INHERITED;
 };
 
 class LightingPointLitSpecularBench : public LightingBaseBench {
 public:
     LightingPointLitSpecularBench(bool small) : INHERITED(small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fIsSmall ? "lightingpointlitspecular_small" : "lightingpointlitspecular_large";
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        draw(canvas, SkLightingImageFilter::CreatePointLitSpecular(getPointLocation(), getWhite(),
-            getSurfaceScale(), getKs(), getShininess()));
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+        draw(loops, canvas, SkLightingImageFilter::CreatePointLitSpecular(getPointLocation(),
+                                                                          getWhite(),
+                                                                          getSurfaceScale(),
+                                                                          getKs(),
+                                                                          getShininess()));
     }
 
 private:
     typedef LightingBaseBench INHERITED;
 };
 
 class LightingDistantLitSpecularBench : public LightingBaseBench {
 public:
     LightingDistantLitSpecularBench(bool small) : INHERITED(small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fIsSmall ? "lightingdistantlitspecular_small" : "lightingdistantlitspecular_large";
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        draw(canvas, SkLightingImageFilter::CreateDistantLitSpecular(getDistantDirection(),
-            getWhite(), getSurfaceScale(), getKs(), getShininess()));
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+        draw(loops, canvas, SkLightingImageFilter::CreateDistantLitSpecular(getDistantDirection(),
+                                                                            getWhite(),
+                                                                            getSurfaceScale(),
+                                                                            getKs(),
+                                                                            getShininess()));
     }
 
 private:
     typedef LightingBaseBench INHERITED;
 };
 
 class LightingSpotLitSpecularBench : public LightingBaseBench {
 public:
     LightingSpotLitSpecularBench(bool small) : INHERITED(small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fIsSmall ? "lightingspotlitspecular_small" : "lightingspotlitspecular_large";
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        draw(canvas, SkLightingImageFilter::CreateSpotLitSpecular(getSpotLocation(),
-            getSpotTarget(), getSpotExponent(), getCutoffAngle(), getWhite(), getSurfaceScale(),
-            getKs(), getShininess()));
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+        draw(loops, canvas, SkLightingImageFilter::CreateSpotLitSpecular(getSpotLocation(),
+                                                                         getSpotTarget(),
+                                                                         getSpotExponent(),
+                                                                         getCutoffAngle(),
+                                                                         getWhite(),
+                                                                         getSurfaceScale(),
+                                                                         getKs(),
+                                                                         getShininess()));
     }
 
 private:
     typedef LightingBaseBench INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new LightingPointLitDiffuseBench(true); )
 DEF_BENCH( return new LightingPointLitDiffuseBench(false); )
 DEF_BENCH( return new LightingDistantLitDiffuseBench(true); )
 DEF_BENCH( return new LightingDistantLitDiffuseBench(false); )
 DEF_BENCH( return new LightingSpotLitDiffuseBench(true); )
 DEF_BENCH( return new LightingSpotLitDiffuseBench(false); )
 DEF_BENCH( return new LightingPointLitSpecularBench(true); )
 DEF_BENCH( return new LightingPointLitSpecularBench(false); )
 DEF_BENCH( return new LightingDistantLitSpecularBench(true); )
 DEF_BENCH( return new LightingDistantLitSpecularBench(false); )
 DEF_BENCH( return new LightingSpotLitSpecularBench(true); )
 DEF_BENCH( return new LightingSpotLitSpecularBench(false); )