commit d8a90f9be1f068dd8231cc6c9e9d490d17e7ece6
author Brian Osman <brianosman@google.com> Mon Jan 28 13:41:19 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jan 28 19:06:06 2019 +0000
tree 50e719471da0dfd97378a7dcf888e4860bf1b193
parent 41f0e28fd5bd11a7ebf5400f1f046d882de1e4a7

Converting more debug code to SkJSONWriter

All of SkDrawCommand / SkDebugCanvas now uses SkJSONWriter.
Also removed the bespoke json generator and pretty-printer
in GrAuditTrail. This was the largest volume of code still
using JsonCPP. (There are other stragglers).

Bug: skia:
Change-Id: I3aee554764689ce50c8e707caf26c76093b9bb8f
Reviewed-on: https://skia-review.googlesource.com/c/187040
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>

tools/skp_parser.cpp

diff --git a/tools/skp_parser.cpp b/tools/skp_parser.cpp
index dcdea7c..25b0ea4 100644
--- a/tools/skp_parser.cpp
+++ b/tools/skp_parser.cpp
@@ -55,8 +55,12 @@
     pic->playback(&debugCanvas);
     std::unique_ptr<SkCanvas> nullCanvas = SkMakeNullCanvas();
     UrlDataManager dataManager(SkString("data"));
-    Json::Value json = debugCanvas.toJSON(
-            dataManager, debugCanvas.getSize(), nullCanvas.get());
+    SkDynamicMemoryWStream stream;
+    SkJSONWriter writer(&stream, SkJSONWriter::Mode::kPretty);
+    writer.beginObject(); // root
+    debugCanvas.toJSON(writer, dataManager, debugCanvas.getSize(), nullCanvas.get());
+    writer.endObject(); // root
+    writer.flush();
     if (argc > 2) {
         if (UrlDataManager::UrlData* data =
             dataManager.getDataFromUrl(SkString(argv[2]))) {
@@ -72,7 +76,8 @@
             return 4;
         }
     } else {
-        Json::StyledStreamWriter("  ").write(std::cout, json);
+        sk_sp<SkData> data = stream.detachAsData();
+        fwrite(data->data(), data->size(), 1, stdout);
     }
     return 0;
 }