Revert of small tidy of benchmarkstream

tools/VisualBench/TimingStateMachine.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef TimingStateMachine_DEFINED
 #define TimingStateMachine_DEFINED
 
@@ skipping 20 matching lines @@
     enum ParentEvents {
         kReset_ParentEvents,
         kTiming_ParentEvents,
         kTimingFinished_ParentEvents,// This implies parent can read lastMeasurement() and must
                                      // reset
     };
 
     ParentEvents nextFrame(bool preWarmBetweenSamples);
 
     /*
-     * The caller should call this when they are ready to move to the next benchmark.
+     * The caller should call this when they are ready to move to the next benchmark.  The caller
+     * must call this with the *last* benchmark so post draw hooks can be invoked
      */
-    void nextBenchmark();
+    void nextBenchmark(SkCanvas*, Benchmark*);
 
     /*
      * When TimingStateMachine returns kTimingFinished_ParentEvents, then the owner can call
      * lastMeasurement() to get the time
      */
     double lastMeasurement() const { return fLastMeasurement; }
 
     int loops() const { return fLoops; }
 
 private:
@@ skipping 12 matching lines @@
 
     int fCurrentFrame;
     int fLoops;
     double fLastMeasurement;
     WallTimer fTimer;
     State fState;
     InnerState fInnerState;
 };
 
 #endif