Do timer allocation and string building outside of bench loops

tools/PictureBenchmark.h

Index: tools/PictureBenchmark.h
diff --git a/tools/PictureBenchmark.h b/tools/PictureBenchmark.h
index 70c56d994972d1f5a9f88f029c8977cbe099fe6c..1f01ce533ad726ac42e11a9c2a9fbb2f93beb88d 100644
--- a/tools/PictureBenchmark.h
+++ b/tools/PictureBenchmark.h
@@ -10,6 +10,7 @@
 
 #include "SkTypes.h"
 #include "PictureRenderer.h"
+#include "TimerData.h"
 
 class BenchTimer;
 class SkBenchLogger;
@@ -45,32 +46,19 @@ public:
 
     PictureRenderer* setRenderer(PictureRenderer*);
 
-    void setLogPerIter(bool log) { fLogPerIter = log; }
+    void setTimerResultType(TimerData::Result resultType) { fTimerResult = resultType; }
 
-    void setPrintMin(bool min) { fPrintMin = min; }
-
-    void setTimersToShow(bool wall, bool truncatedWall, bool cpu, bool truncatedCpu, bool gpu) {
-        fShowWallTime = wall;
-        fShowTruncatedWallTime = truncatedWall;
-        fShowCpuTime = cpu;
-        fShowTruncatedCpuTime = truncatedCpu;
-        fShowGpuTime = gpu;
-    }
+    void setTimersToShow(bool wall, bool truncatedWall, bool cpu, bool truncatedCpu, bool gpu);
 
     void setLogger(SkBenchLogger* logger) { fLogger = logger; }
 
 private:
-    int              fRepeats;
-    SkBenchLogger*   fLogger;
-    PictureRenderer* fRenderer;
-    bool             fLogPerIter;
-    bool             fPrintMin;
-    bool             fShowWallTime;
-    bool             fShowTruncatedWallTime;
-    bool             fShowCpuTime;
-    bool             fShowTruncatedCpuTime;
-    bool             fShowGpuTime;
-    bool             fTimeIndividualTiles;
+    int               fRepeats;
+    SkBenchLogger*    fLogger;
+    PictureRenderer*  fRenderer;
+    TimerData::Result fTimerResult;
+    uint32_t          fTimerTypes; // bitfield of TimerData::TimerFlags values
+    bool              fTimeIndividualTiles;
 
     void logProgress(const char msg[]);