Changed JSON formatting more, workaround bug where SkStringPrintf causes encoding issues

bench/ResultsWriter.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Classes for writing out bench results in various formats.
  */
 #ifndef SkResultsWriter_DEFINED
 #define SkResultsWriter_DEFINED
@@ skipping 63 matching lines @@
     }
 private:
     SkBenchLogger& fLogger;
     const char* fTimeFormat;
 };
 
 #ifdef SK_BUILD_JSON_WRITER
 /**
  * This ResultsWriter handles writing out the results in JSON.
  *
- * The output looks like:
+ * The output looks like (except compressed to a single line):
  *
  *  {
  *   "options" : {
  *      "alpha" : "0xFF",
  *      "scale" : "0",
  *      ...
  *      "system" : "UNIX"
  *   },
- *   "results" : {
- *      "Xfermode_Luminosity_640_480" : {
- *         "565" : {
+ *   "results" : [
+ *      {
+ *      "name" : "Xfermode_Luminosity_640_480",
+ *      "results" : [
+ *         {
+ *            "name": "565",
  *            "cmsecs" : 143.188128906250,
  *            "msecs" : 143.835957031250
  *         },
  *         ...
  */
 class JSONResultsWriter : public ResultsWriter {
 private:
     Json::Value* find_named_node(Json::Value* root, const char name[]) {
         Json::Value* search_results = NULL;
         for(Json::Value::iterator iter = root->begin();
                 iter!= root->end(); ++iter) {
             if(SkString(name).equals((*iter)["name"].asCString())) {
                 search_results = &(*iter);
                 break;
             }
         }
 
         if(search_results != NULL) {
             return search_results;
         } else {
-            return &(root->append(Json::Value()));
+            Json::Value* new_val = &(root->append(Json::Value()));
+            (*new_val)["name"] = name;
+            return new_val;
         }
     }
 public:
     explicit JSONResultsWriter(const char filename[])
         : fFilename(filename)
         , fRoot()
         , fResults(fRoot["results"])
         , fBench(NULL)
         , fConfig(NULL) {
     }
     virtual void option(const char name[], const char value[]) {
         fRoot["options"][name] = value;
     }
     virtual void bench(const char name[], int32_t x, int32_t y) {
-        const char* full_name = SkStringPrintf( "%s_%d_%d", name, x, y).c_str();
-        Json::Value* bench_node = find_named_node(&fResults, full_name);
-        (*bench_node)["name"] = full_name;
+        SkString sk_name(name);
+        sk_name.append("_");
+        sk_name.appendS32(x);
+        sk_name.append("_");
+        sk_name.appendS32(y);
+        Json::Value* bench_node = find_named_node(&fResults, sk_name.c_str());
         fBench = &(*bench_node)["results"];
     }
     virtual void config(const char name[]) {
         SkASSERT(NULL != fBench);
         fConfig = find_named_node(fBench, name);
-        (*fConfig)["name"] = name;
     }
     virtual void timer(const char name[], double ms) {
         SkASSERT(NULL != fConfig);
         (*fConfig)[name] = ms;
     }
     virtual void end() {
         SkFILEWStream stream(fFilename.c_str());
-        stream.writeText(fRoot.toStyledString().c_str());
+        stream.writeText(Json::FastWriter().write(fRoot).c_str());
         stream.flush();
     }
 private:
+
     SkString fFilename;
     Json::Value fRoot;
     Json::Value& fResults;
     Json::Value* fBench;
     Json::Value* fConfig;
 };
 
 #endif // SK_BUILD_JSON_WRITER
 /**
  * This ResultsWriter writes out to multiple ResultsWriters.
@@ skipping 39 matching lines @@
  */
 template <typename T> class CallEnd : SkNoncopyable {
 public:
     CallEnd(T& obj) : fObj(obj) {}
     ~CallEnd() { fObj.end(); }
 private:
     T&  fObj;
 };
 
 #endif