Fix bench logging for --repeat 1

bench/benchmain.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "BenchTimer.h"
@@ skipping 905 matching lines @@
                         SK_GL(*glContext, Finish());
                     }
 #endif
                     // stop the inclusive and gpu timers once all the GL calls
                     // have completed
                     timer->end();
 
                     SkAssertResult(timerData.appendTimes(timer));
 
                 }
-                if (repeatDraw > 1) {
-                    const char* timeFormat;
-                    if (TimerData::kPerIter_Result == timerResult) {
-                        timeFormat = perIterTimeformat.c_str();
-                    } else {
-                        timeFormat = normalTimeFormat.c_str();
-                    }
-                    uint32_t filteredTimerTypes = timerTypes;
-                    if (NULL == context) {
-                        filteredTimerTypes &= ~TimerData::kGpu_Flag;
-                    }
-                    SkString result = timerData.getResult(timeFormat,
-                                        timerResult,
-                                        configName,
-                                        filteredTimerTypes);
-                    logger.logProgress(result);
+                const char* timeFormat;
+                if (repeatDraw > 1 && TimerData::kPerIter_Result == timerResult) {
+                    timeFormat = perIterTimeformat.c_str();
+                } else {
+                    timeFormat = normalTimeFormat.c_str();
                 }
+                uint32_t filteredTimerTypes = timerTypes;
+                if (NULL == context) {
+                    filteredTimerTypes &= ~TimerData::kGpu_Flag;
+                }
+                SkString result = timerData.getResult(timeFormat,
+                                    timerResult,
+                                    configName,
+                                    filteredTimerTypes);
+                logger.logProgress(result);
+
                 if (outDir.size() > 0 && kNonRendering_Backend != backend) {
                     saveFile(bench->getName(), configName, outDir.c_str(),
                              device->accessBitmap(false));
                 }
             }
         }
         if (loggedBenchStart) {
             logger.logProgress(SkString("\n"));
         }
     }
@@ skipping 17 matching lines @@
     }
 
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif