Cleanup timing state machine

bench/Benchmark.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 Benchmark_DEFINED
 #define Benchmark_DEFINED
 
@@ skipping 93 matching lines @@
     void setPaintMasks(uint32_t orMask, uint32_t clearMask) {
         fOrMask = orMask;
         fClearMask = clearMask;
     }
 
     /*
      * Benches which support running in a visual mode can advertise this functionality
      */
     virtual bool isVisual() { return false; }
 
+    /*
+     * VisualBench frequently resets the canvas.  As a result we need to bulk call all of the hooks
+     */
+    void preTimingHooks(SkCanvas* canvas) {
+        this->perCanvasPreDraw(canvas);
+        this->preDraw(canvas);
+    }
+
+    void postTimingHooks(SkCanvas* canvas)  {
+        this->postDraw(canvas);
+        this->perCanvasPostDraw(canvas);
+    }
+
 protected:
     virtual void setupPaint(SkPaint* paint);
 
     virtual const char* onGetName() = 0;
     virtual const char* onGetUniqueName() { return this->onGetName(); }
     virtual void onDelayedSetup() {}
     virtual void onPerCanvasPreDraw(SkCanvas*) {}
     virtual void onPerCanvasPostDraw(SkCanvas*) {}
     virtual void onPreDraw(SkCanvas*) {}
     virtual void onPostDraw(SkCanvas*) {}
     // Each bench should do its main work in a loop like this:
     //   for (int i = 0; i < loops; i++) { <work here> }
     virtual void onDraw(int loops, SkCanvas*) = 0;
 
     virtual SkIPoint onGetSize();
 
 private:
     int     fForceAlpha;
     SkTriState::State  fDither;
     uint32_t    fOrMask, fClearMask;
 
     typedef SkRefCnt INHERITED;
 };
 
 typedef SkTRegistry<Benchmark*(*)(void*)> BenchRegistry;
 
 #endif