Add batch information to json

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 118 matching lines @@
         fprintf(stderr, "Can't read pixels\n");
         return nullptr;
     }
 
     // write to png
     SkDynamicMemoryWStream buffer;
     write_png((const png_bytep) bmp.getPixels(), bmp.width(), bmp.height(), buffer);
     return buffer.copyToData();
 }
 
-SkData* setupAndDrawToCanvasReturnPng(Request* request, int n) {
+SkCanvas* getCanvasFromRequest(Request* request) {
     GrContextFactory* factory = request->fContextFactory;
     SkGLContext* gl = factory->getContextInfo(GrContextFactory::kNative_GLContextType,
                                               GrContextFactory::kNone_GLContextOptions).fGLContext;
     gl->makeCurrent();
     SkASSERT(request->fDebugCanvas);
     SkCanvas* target = request->fSurface->getCanvas();
+    return target;
+}
+
+SkData* setupAndDrawToCanvasReturnPng(Request* request, int n) {
+    SkCanvas* target = getCanvasFromRequest(request);
     request->fDebugCanvas->drawTo(target, n);
     return writeCanvasToPng(target);
 }
 
 SkSurface* setupCpuSurface() {
     SkImageInfo info = SkImageInfo::Make(kImageWidth, kImageHeight, kN32_SkColorType,
                                          kPremul_SkAlphaType);
     return SkSurface::NewRaster(info);
 }
 
@@ skipping 32 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,
+static int SendJSON(MHD_Connection* connection, SkCanvas* canvas, SkDebugCanvas* debugCanvas,
                     UrlDataManager* urlDataManager, int n) {
-    Json::Value root = debugCanvas->toJSON(*urlDataManager, n);
+    Json::Value root = debugCanvas->toJSON(*urlDataManager, n, canvas);
     SkDynamicMemoryWStream stream;
     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]));
@@ skipping 43 matching lines @@
         }
 
         // /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);
+            return SendJSON(connection, getCanvasFromRequest(request), 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 348 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