Fix for visualbench loops forever

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 30 matching lines @@
                     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();
                         if (elapsedMs < FLAGS_loopMs) {
                             fLoops *= 2;
                         } else {
                             fInnerState = kTiming_InnerState;
-                            fState = kPreWarm_State;
                         }
+                        fState = kPreWarm_State;
                         this->resetTimingState();
                         parentEvent = kReset_ParentEvents;
                     }
                     break;
                 }
                 case kTiming_InnerState: {
                     if (fCurrentFrame >= FLAGS_frames) {
                         this->recordMeasurement();
                         this->resetTimingState();
                         parentEvent = kTimingFinished_ParentEvents;
@@ skipping 28 matching lines @@
     fLastMeasurement = this->elapsed() / (FLAGS_frames * fLoops);
 }
 
 void TimingStateMachine::nextBenchmark(SkCanvas* canvas, Benchmark* benchmark) {
     benchmark->postDraw(canvas);
     benchmark->perCanvasPostDraw(canvas);
     fLoops = 1;
     fInnerState = kTuning_InnerState;
     fState = kPreWarm_State;
 }