Make visualbench timing continuous for no-reset mode

tools/VisualBench/TimingStateMachine.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "TimingStateMachine.h"
 
 #include "SkCanvas.h"
@@ skipping 27 matching lines @@
             break;
         }
         case kTiming_State: {
             switch (fInnerState) {
                 case kTuning_InnerState: {
                     if (1 << 30 == fLoops) {
                         // We're about to wrap.  Something's wrong with the bench.
                         SkDebugf("InnerLoops wrapped\n");
                         fLoops = 1;
                     } else {
-                        double elapsedMs = this->elapsed();
+                        double elapsedMs = now_ms() - fStartTime;
                         if (elapsedMs < FLAGS_loopMs) {
                             fLoops *= 2;
                         } else {
                             fInnerState = kTiming_InnerState;
                         }
                         fState = kPreWarm_State;
-                        this->resetTimingState();
+                        fCurrentFrame = 0;
                         parentEvent = kReset_ParentEvents;
                     }
                     break;
                 }
                 case kTiming_InnerState: {
                     if (fCurrentFrame >= FLAGS_frames) {
-                        this->recordMeasurement();
-                        this->resetTimingState();
+                        double now = now_ms();
+                        fLastMeasurement = (now - fStartTime) / (FLAGS_frames * fLoops);
+                        fCurrentFrame = 0;
                         parentEvent = kTimingFinished_ParentEvents;
                         if (preWarmBetweenSamples) {
                             fState = kPreWarm_State;
                         } else {
-                            fStartTime = now_ms();
+                            fStartTime = now;
                         }
                     } else {
                         fCurrentFrame++;
                     }
                     break;
                 }
             }
         }
         break;
     }
     return parentEvent;
 }
 
-inline double TimingStateMachine::elapsed() {
-    return now_ms() - fStartTime;
-}
-
-void TimingStateMachine::resetTimingState() {
-    fCurrentFrame = 0;
-}
-
-void TimingStateMachine::recordMeasurement() {
-    fLastMeasurement = this->elapsed() / (FLAGS_frames * fLoops);
-}
-
 void TimingStateMachine::nextBenchmark() {
     fLoops = 1;
     fInnerState = kTuning_InnerState;
     fState = kPreWarm_State;
 }