Separate JSON functions from DMWriteTask.

dm/DMWriteTask.cpp

 #include "DMWriteTask.h"
 
+#include "DMJsonWriter.h"
 #include "DMUtil.h"
 #include "SkColorPriv.h"
 #include "SkCommonFlags.h"
 #include "SkData.h"
 #include "SkImageEncoder.h"
 #include "SkMD5.h"
 #include "SkMallocPixelRef.h"
 #include "SkOSFile.h"
 #include "SkStream.h"
 #include "SkString.h"
@@ skipping 71 matching lines @@
 static bool write_asset(SkStreamAsset* input, SkWStream* output) {
     return input->rewind() && output->writeStream(input, input->getLength());
 }
 
 static SkString get_md5(SkStreamAsset* stream) {
     SkMD5 hasher;
     write_asset(stream, &hasher);
     return get_md5_string(&hasher);
 }
 
-struct JsonData {
-    SkString name;            // E.g. "ninepatch-stretch", "desk-gws_skp"
-    SkString config;          //      "gpu", "8888"
-    SkString mode;            //      "direct", "default-tilegrid", "pipe"
-    SkString sourceType;      //      "GM", "SKP"
-    SkString md5;             // In ASCII, so 32 bytes long.
-};
-SkTArray<JsonData> gJsonData;
-SK_DECLARE_STATIC_MUTEX(gJsonDataLock);
-
 void WriteTask::draw() {
     SkString md5;
     {
         SkAutoLockPixels lock(fBitmap);
         md5 = fData ? get_md5(fData)
                     : get_md5(fBitmap.getPixels(), fBitmap.getSize());
     }
 
     SkASSERT(fSuffixes.count() > 0);
     SkString config = fSuffixes.back();
     SkString mode("direct");
     if (fSuffixes.count() > 1) {
         mode = fSuffixes.fromBack(1);
     }
 
-    JsonData entry = { fBaseName, config, mode, fSourceType, md5 };
     {
-        SkAutoMutexAcquire lock(&gJsonDataLock);
-        gJsonData.push_back(entry);
+        const JsonWriter::BitmapResult entry = { fBaseName,
+                                                 config,
+                                                 mode,
+                                                 fSourceType,
+                                                 md5 };
+        JsonWriter::AddBitmapResult(entry);
     }
 
     SkString dir(FLAGS_writePath[0]);
 #if defined(SK_BUILD_FOR_IOS)
     if (dir.equals("@")) {
         dir.set(FLAGS_resourcePath[0]);
     }
 #endif
     this->makeDirOrFail(dir);
 
@@ skipping 38 matching lines @@
         name.appendf("%s/", fSuffixes[i].c_str());
     }
     name.append(fBaseName.c_str());
     return name;
 }
 
 bool WriteTask::shouldSkip() const {
     return FLAGS_writePath.isEmpty();
 }
 
-void WriteTask::DumpJson() {
-    if (FLAGS_writePath.isEmpty()) {
-        return;
-    }
-
-    Json::Value root;
-
-    for (int i = 1; i < FLAGS_properties.count(); i += 2) {
-        root[FLAGS_properties[i-1]] = FLAGS_properties[i];
-    }
-    for (int i = 1; i < FLAGS_key.count(); i += 2) {
-        root["key"][FLAGS_key[i-1]] = FLAGS_key[i];
-    }
-
-    {
-        SkAutoMutexAcquire lock(&gJsonDataLock);
-        for (int i = 0; i < gJsonData.count(); i++) {
-            Json::Value result;
-            result["key"]["name"]            = gJsonData[i].name.c_str();
-            result["key"]["config"]          = gJsonData[i].config.c_str();
-            result["key"]["mode"]            = gJsonData[i].mode.c_str();
-            result["options"]["source_type"] = gJsonData[i].sourceType.c_str();
-            result["md5"]                    = gJsonData[i].md5.c_str();
-
-            root["results"].append(result);
-        }
-    }
-
-    SkString path = SkOSPath::Join(FLAGS_writePath[0], "dm.json");
-    SkFILEWStream stream(path.c_str());
-    stream.writeText(Json::StyledWriter().write(root).c_str());
-    stream.flush();
-}
-
 }  // namespace DM