Some cleanups of VisualBench

tools/VisualBench/VisualBench.h

Index: tools/VisualBench/VisualBench.h
diff --git a/tools/VisualBench/VisualBench.h b/tools/VisualBench/VisualBench.h
index b8cd2bdb771a866171f32c25ab40c9920641dcc2..e5064b9affd098dbe52a4aa8ec61bce8583d8504 100644
--- a/tools/VisualBench/VisualBench.h
+++ b/tools/VisualBench/VisualBench.h
@@ -39,6 +39,14 @@ protected:
     void onSizeChange() override;
 
 private:
+    enum State {

[bsalomon, 2015/07/17 15:18:22]

Needs some comments here... This is pretty complicated.

+        kPreWarmLoopsPerCanvasPreDraw_State,
+        kPreWarmLoops_State,
+        kTuneLoops_State,
+        kPreWarmTimingPerCanvasPreDraw_State,
+        kPreWarmTiming_State,
+        kTiming_State,
+    };
     void setTitle();
     bool setupBackend();
     void resetContext();
@@ -47,19 +55,21 @@ private:
     void printStats();
     bool advanceRecordIfNecessary(SkCanvas*);
     inline void renderFrame(SkCanvas*);
+    inline void nextState(State);
+    void perCanvasPreDraw(SkCanvas*, State);
+    void preWarm(State nextState);
+    void scaleLoops(double elapsedMs);
+    inline void tuneLoops();
+    inline void timing(SkCanvas*);
+    inline double elapsed();
+    void resetTimingState();
+    void postDraw(SkCanvas*);
+    void recordMeasurement();
 
     struct Record {
         SkTArray<double> fMeasurements;
     };
 
-    enum State {
-        kPreWarmLoops_State,
-        kTuneLoops_State,
-        kPreWarmTiming_State,
-        kTiming_State,
-    };
-    void preWarm(State nextState);
-
     int fCurrentSample;
     int fCurrentFrame;
     int fFlushes;