Reland https://codereview.chromium.org/286903025

bench/TimerData.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef TimerData_DEFINED
 #define TimerData_DEFINED
 
 #include "SkString.h"
 #include "SkTemplates.h"
 
+#ifdef SK_BUILD_FOR_WIN
+    #pragma warning(push)
+    #pragma warning(disable : 4530)
+#endif
+
+#include "SkJSONCPP.h"
+
+#ifdef SK_BUILD_FOR_WIN
+    #pragma warning(pop)
+#endif
 
 class BenchTimer;
 
 class TimerData {
 public:
     /**
      * Constructs a TimerData to hold at most maxNumTimings sets of elapsed timer values.
      **/
     explicit TimerData(int maxNumTimings);
 
@@ skipping 26 matching lines @@
      * @param the name of the config being timed (prepended to results string)
      * @param timerFlags bitfield of TimerFlags values indicating which timers should be reported.
      * @param itersPerTiming the number of test/bench iterations that correspond to each
      *        appendTimes() call, 1 when appendTimes is called for each iteration.
      */
     SkString getResult(const char* doubleFormat,
                        Result result,
                        const char* configName,
                        uint32_t timerFlags,
                        int itersPerTiming = 1);
+#ifdef SK_BUILD_JSON_WRITER
+    Json::Value getJSON(uint32_t timerFlags, 
+                        Result result,
+                        int itersPerTiming = 1);
+#endif // SK_BUILD_JSON_WRITER
 
 private:
     int fMaxNumTimings;
     int fCurrTiming;
 
     SkAutoTArray<double> fWallTimes;
     SkAutoTArray<double> fTruncatedWallTimes;
     SkAutoTArray<double> fCpuTimes;
     SkAutoTArray<double> fTruncatedCpuTimes;
     SkAutoTArray<double> fGpuTimes;
 };
 
 #endif // TimerData_DEFINED