wire up new json code in skiaserve

tools/skiaserve/skiaserve.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrCaps.h"
 #include "GrContextFactory.h"
 #include "SkCanvas.h"
@@ skipping 153 matching lines @@
 
     if (setContentDisposition) {
         MHD_add_response_header(response, "Content-Disposition", dispositionString);
     }
 
     int ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
     MHD_destroy_response(response);
     return ret;
 }
 
-static int SendJSON(MHD_Connection* connection, SkDebugCanvas* debugCanvas, int n) {
+static int SendJSON(MHD_Connection* connection, SkDebugCanvas* debugCanvas,
+                    UrlDataManager* urlDataManager, int n) {
+    Json::Value root = debugCanvas->toJSON(*urlDataManager, n);
     SkDynamicMemoryWStream stream;
-    SkAutoTUnref<SkJSONCanvas> jsonCanvas(new SkJSONCanvas(kImageWidth, kImageHeight, stream));
-    debugCanvas->drawTo(jsonCanvas, n);
-    jsonCanvas->finish();
+    stream.writeText(Json::FastWriter().write(root).c_str());
 
     SkAutoTUnref<SkData> data(stream.copyToData());
     return SendData(connection, data, "application/json");
 }
 
 static int SendTemplate(MHD_Connection* connection, bool redirect = false,
                         const char* redirectUrl = nullptr) {
     SkString debuggerTemplate = generateTemplate(SkString(FLAGS_source[0]));
 
     MHD_Response* response = MHD_create_response_from_buffer(
@@ skipping 33 matching lines @@
     int handle(Request* request, MHD_Connection* connection,
                const char* url, const char* method,
                const char* upload_data, size_t* upload_data_size) override {
         SkTArray<SkString> commands;
         SkStrSplit(url, "/", &commands);
 
         if (!request->fPicture.get() || commands.count() > 3) {
             return MHD_NO;
         }
 
-        // /cmd or /cmd/N or /cmd/N/[0|1]
-        if (commands.count() == 1 && 0 == strcmp(method, MHD_HTTP_METHOD_GET)) {
-            int n = request->fDebugCanvas->getSize() - 1;
-            return SendJSON(connection, request->fDebugCanvas, n);
+        // /cmd or /cmd/N
+        if (0 == strcmp(method, MHD_HTTP_METHOD_GET)) {
+            int n;
+            if (commands.count() == 1) {
+                n = request->fDebugCanvas->getSize() - 1;
+            } else {
+                sscanf(commands[1].c_str(), "%d", &n);
+            }
+            return SendJSON(connection, request->fDebugCanvas, &request->fUrlDataManager, n);
         }
 
         // /cmd/N, for now only delete supported
         if (commands.count() == 2 && 0 == strcmp(method, MHD_HTTP_METHOD_DELETE)) {
             int n;
             sscanf(commands[1].c_str(), "%d", &n);
             request->fDebugCanvas->deleteDrawCommandAt(n);
             return SendOK(connection);
         }
 
@@ skipping 312 matching lines @@
     MHD_stop_daemon(daemon);
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return skiaserve_main();
 }
 #endif