small tidy of benchmarkstream

tools/VisualBench/VisualStreamTimingModule.h

Index: tools/VisualBench/VisualStreamTimingModule.h
diff --git a/tools/VisualBench/VisualStreamTimingModule.h b/tools/VisualBench/VisualStreamTimingModule.h
index ac06ed4307601782cdd257acd378d6a418c42649..5dbec693fa969d6294e09c267cf36c24cd11fef5 100644
--- a/tools/VisualBench/VisualStreamTimingModule.h
+++ b/tools/VisualBench/VisualStreamTimingModule.h
@@ -14,6 +14,8 @@
 #include "VisualBench.h"
 #include "VisualBenchmarkStream.h"
 
+class SkCanvas;
+
 /*
  * VisualStreamTimingModule is the base class for modules which want to time a stream of Benchmarks.
  *
@@ -31,12 +33,17 @@ private:
     // subclasses should return true to advance the stream
     virtual bool timingFinished(Benchmark*, int loops, double measurement)=0;
 
-    bool nextBenchmarkIfNecessary(SkCanvas*);
+    inline void handleInitState(SkCanvas*);
+    inline void handleTimingEvent(SkCanvas*, TimingStateMachine::ParentEvents);
 
     TimingStateMachine fTSM;
     SkAutoTDelete<VisualBenchmarkStream> fBenchmarkStream;
-    SkAutoTUnref<Benchmark> fBenchmark;
-    bool fReinitializeBenchmark;
+    enum InitState {
+        kNone_InitState,
+        kReset_InitState,
+        kNewBenchmark_InitState,
+    };
+    InitState fInitState;
     bool fPreWarmBeforeSample;
 
     // support framework