Simplify benchmark internal API.

bench/SkBenchmark.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkBenchmark_DEFINED
 #define SkBenchmark_DEFINED
 
@@ skipping 49 matching lines @@
     // the rendering mode.
     virtual bool isSuitableFor(Backend backend) {
         return backend != kNonRendering_Backend;
     }
 
     // Call before draw, allows the benchmark to do setup work outside of the
     // timer. When a benchmark is repeatedly drawn, this should be called once
     // before the initial draw.
     void preDraw();
 
-    void draw(SkCanvas*);
+    // Bench framework can tune loops to be large enough for stable timing.
+    void draw(const int loops, SkCanvas*);
 
     // Call after draw, allows the benchmark to do cleanup work outside of the
     // timer. When a benchmark is repeatedly drawn, this is only called once
     // after the last draw.
     void postDraw();
 
     void setForceAlpha(int alpha) {
         fForceAlpha = alpha;
     }
 
@@ skipping 16 matching lines @@
      *      uint32_t flags = paint.getFlags();
      *      flags &= ~clearMask;
      *      flags |= orMask;
      *      paint.setFlags(flags);
      */
     void setPaintMasks(uint32_t orMask, uint32_t clearMask) {
         fOrMask = orMask;
         fClearMask = clearMask;
     }
 
-    // The bench framework calls this to control the runtime of a bench.
-    void setLoops(int loops) {
-        fLoops = loops;
-    }
-
-    // Each bench should do its main work in a loop like this:
-    //   for (int i = 0; i < this->getLoops(); i++) { <work here> }
-    int getLoops() const { return fLoops; }
-
     static void SetResourcePath(const char* resPath) { gResourcePath.set(resPath); }
 
     static SkString& GetResourcePath() { return gResourcePath; }
 
 protected:
     virtual void setupPaint(SkPaint* paint);
 
     virtual const char* onGetName() = 0;
     virtual void onPreDraw() {}
-    virtual void onDraw(SkCanvas*) = 0;
+    // Each bench should do its main work in a loop like this:
+    //   for (int i = 0; i < loops; i++) { <work here> }
+    virtual void onDraw(const int loops, SkCanvas*) = 0;
     virtual void onPostDraw() {}
 
     virtual SkIPoint onGetSize();
 
 private:
     int     fForceAlpha;
     bool    fForceAA;
     bool    fForceFilter;
     SkTriState::State  fDither;
     uint32_t    fOrMask, fClearMask;
-    int fLoops;
     static  SkString gResourcePath;
 
     typedef SkRefCnt INHERITED;
 };
 
 typedef SkTRegistry<SkBenchmark*(*)()> BenchRegistry;
 
 #endif