Fixup some of the batch info in skiaserve

tools/skiaserve/Request.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 "Request.h"
 
 #include "png.h"
@@ skipping 131 matching lines @@
     // parse picture from stream
     fPicture.reset(SkPicture::CreateFromStream(stream));
     if (!fPicture.get()) {
         fprintf(stderr, "Could not create picture from stream.\n");
         return false;
     }
 
     // pour picture into debug canvas
     fDebugCanvas.reset(new SkDebugCanvas(kImageWidth, Request::kImageHeight));
     fDebugCanvas->drawPicture(fPicture);
+
+    // for some reason we need to 'flush' the debug canvas by drawing all of the ops
+    fDebugCanvas->drawTo(this->getCanvas(), this->getLastOp());
     return true;
 }
 
 GrAuditTrail* Request::getAuditTrail(SkCanvas* canvas) {
     GrAuditTrail* at = nullptr;
 #if SK_SUPPORT_GPU
     GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
     if (rt) {
         GrContext* ctx = rt->getContext();
         if (ctx) {
@@ skipping 25 matching lines @@
 }
 
 SkData* Request::getJsonBatchList(int n) {
     SkCanvas* canvas = this->getCanvas();
     SkASSERT(fGPUEnabled);
 
     // TODO if this is inefficient we could add a method to GrAuditTrail which takes
     // a Json::Value and is only compiled in this file
     Json::Value parsedFromString;
 #if SK_SUPPORT_GPU
+    // we use the toJSON method on debug canvas, but then just ignore the results and pull
+    // the information we care about from the audit trail
+    fDebugCanvas->toJSON(fUrlDataManager, n, canvas); 
+
     GrAuditTrail* at = this->getAuditTrail(canvas);
     GrAuditTrail::AutoManageBatchList enable(at);
-    
-    fDebugCanvas->drawTo(canvas, n);
-
     Json::Reader reader;
-    SkDEBUGCODE(bool parsingSuccessful = )reader.parse(at->toJson(true).c_str(),
+    SkDEBUGCODE(bool parsingSuccessful = )reader.parse(at->toJson().c_str(),
                                                        parsedFromString);
     SkASSERT(parsingSuccessful);
 #endif
 
     SkDynamicMemoryWStream stream;
     stream.writeText(Json::FastWriter().write(parsedFromString).c_str());
 
     return stream.copyToData();
 }
 
@@ skipping 10 matching lines @@
     SkIRect clip = fDebugCanvas->getCurrentClip();
     Json::Value info(Json::objectValue);
     info["ViewMatrix"] = SkJSONCanvas::MakeMatrix(vm);
     info["ClipRect"] = SkJSONCanvas::MakeIRect(clip);
 
     std::string json = Json::FastWriter().write(info);
 
     // We don't want the null terminator so strlen is correct
     return SkData::NewWithCopy(json.c_str(), strlen(json.c_str()));
 }