Fix some bugs and performance issues with skiaserve

tools/debugger/SkDebugCanvas.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvasPriv.h"
 #include "SkClipStack.h"
 #include "SkDebugCanvas.h"
@@ skipping 208 matching lines @@
         fPaintFilterCanvas->addCanvas(canvas);
         canvas = fPaintFilterCanvas.get();
     
     }
 
     if (fMegaVizMode) {
         this->markActiveCommands(index);
     }
    
     // If we have a GPU backend we can also visualize the batching information
-#if SK_SUPPORT_GPU
     GrAuditTrail* at = nullptr;
-    GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
-    if (rt && (fDrawGpuBatchBounds || m != -1)) {
-        GrContext* ctx = rt->getContext();
-        if (ctx) {
-            at = ctx->getAuditTrail();
-        }
+    if (fDrawGpuBatchBounds || m != -1) {
+        at = this->getAuditTrail(canvas);
     }
-#endif
 
     for (int i = 0; i <= index; i++) {
         if (i == index && fFilter) {
             canvas->clear(0xAAFFFFFF);
         }
    
 #if SK_SUPPORT_GPU
         GrAuditTrail::AutoCollectBatches* acb = nullptr;
         if (at) {
             acb = new GrAuditTrail::AutoCollectBatches(at, i);
@@ skipping 119 matching lines @@
             for (int j = 0; j < childrenBounds[i].fBatches.count(); j++) {
                 const GrAuditTrail::BatchInfo::Batch& batch = childrenBounds[i].fBatches[j];
                 if (batch.fClientID != index) {
                     paint.setColor(kOtherBatchBounds);
                 } else {
                     paint.setColor(kOpBatchBounds);
                 }
                 canvas->drawRect(batch.fBounds, paint);
             }
         }
-
-        at->fullReset();
     }
-    
 #endif
+    this->cleanupAuditTrail(canvas);
 }
 
 void SkDebugCanvas::deleteDrawCommandAt(int index) {
     SkASSERT(index < fCommandVector.count());
     delete fCommandVector[index];
     fCommandVector.remove(index);
 }
 
 SkDrawCommand* SkDebugCanvas::getDrawCommandAt(int index) {
     SkASSERT(index < fCommandVector.count());
@@ skipping 17 matching lines @@
 }
 
 const SkTDArray <SkDrawCommand*>& SkDebugCanvas::getDrawCommands() const {
     return fCommandVector;
 }
 
 SkTDArray <SkDrawCommand*>& SkDebugCanvas::getDrawCommands() {
     return fCommandVector;
 }
 
-Json::Value SkDebugCanvas::toJSON(UrlDataManager& urlDataManager, int n, SkCanvas* canvas) {
+GrAuditTrail* SkDebugCanvas::getAuditTrail(SkCanvas* canvas) {
+    GrAuditTrail* at = nullptr;
 #if SK_SUPPORT_GPU
     GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
-    GrAuditTrail* at = nullptr;
     if (rt) {
         GrContext* ctx = rt->getContext();
-        if(ctx) {
+        if (ctx) {
             at = ctx->getAuditTrail();
-
-            // loop over all of the commands and draw them, this is to collect reordering
-            // information
-            for (int i = 0; i < this->getSize() && i <= n; i++) {
-                GrAuditTrail::AutoCollectBatches enable(at, i);
-                fCommandVector[i]->execute(canvas);
-            }
-
-            // in case there is some kind of global reordering
-            {
-                GrAuditTrail::AutoEnable ae(at);
-                canvas->flush();
-            }
         }
     }
 #endif
+    return at;
+}
+
+void SkDebugCanvas::drawAndCollectBatches(int n, SkCanvas* canvas) {
+    GrAuditTrail* at = this->getAuditTrail(canvas);
+    if (at) {
+#if SK_SUPPORT_GPU
+        // loop over all of the commands and draw them, this is to collect reordering
+        // information
+        for (int i = 0; i < this->getSize() && i <= n; i++) {
+            GrAuditTrail::AutoCollectBatches enable(at, i);
+            fCommandVector[i]->execute(canvas);
+        }
+
+        // in case there is some kind of global reordering
+        {
+            GrAuditTrail::AutoEnable ae(at);
+            canvas->flush();
+        }
+#endif
+    }
+}
+
+void SkDebugCanvas::cleanupAuditTrail(SkCanvas* canvas) {
+    GrAuditTrail* at = this->getAuditTrail(canvas);
+    if (at) {
+#if SK_SUPPORT_GPU
+        GrAuditTrail::AutoEnable ae(at);
+        at->fullReset();
+#endif
+    }
+}
+
+Json::Value SkDebugCanvas::toJSON(UrlDataManager& urlDataManager, int n, SkCanvas* canvas) {
+    this->drawAndCollectBatches(n, canvas);
     
     // now collect json
+    GrAuditTrail* at = this->getAuditTrail(canvas);
     Json::Value result = Json::Value(Json::objectValue);
     result[SKDEBUGCANVAS_ATTRIBUTE_VERSION] = Json::Value(SKDEBUGCANVAS_VERSION);
     Json::Value commands = Json::Value(Json::arrayValue);
     for (int i = 0; i < this->getSize() && i <= n; i++) {
         commands[i] = this->getDrawCommandAt(i)->toJSON(urlDataManager);
 #if SK_SUPPORT_GPU
         if (at) {
             // 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;
             Json::Reader reader;
             SkAssertResult(reader.parse(at->toJson(i).c_str(), parsedFromString));
 
             commands[i][SKDEBUGCANVAS_ATTRIBUTE_AUDITTRAIL] = parsedFromString;
         }
 #endif
     }
-#if SK_SUPPORT_GPU
-    if (at) {
-        GrAuditTrail::AutoEnable ae(at);
-        at->fullReset();
-    }
-#endif
+    this->cleanupAuditTrail(canvas);
     result[SKDEBUGCANVAS_ATTRIBUTE_COMMANDS] = commands;
     return result;
 }
 
+Json::Value SkDebugCanvas::toJSONBatchList(int n, SkCanvas* canvas) {
+    this->drawAndCollectBatches(n, canvas);
+
+    Json::Value parsedFromString;
+    GrAuditTrail* at = this->getAuditTrail(canvas);
+#if SK_SUPPORT_GPU
+    if (at) {
+        GrAuditTrail::AutoManageBatchList enable(at);
+        Json::Reader reader;
+        SkAssertResult(reader.parse(at->toJson().c_str(), parsedFromString));
+    }
+#endif
+    this->cleanupAuditTrail(canvas);
+    return parsedFromString;
+}
+
 void SkDebugCanvas::updatePaintFilterCanvas() {
     if (!fOverdrawViz && !fOverrideFilterQuality) {
         fPaintFilterCanvas.reset(nullptr);
         return;
     }
 
     const SkImageInfo info = this->imageInfo();
     fPaintFilterCanvas.reset(new DebugPaintFilterCanvas(info.width(), info.height(), fOverdrawViz,
                                                         fOverrideFilterQuality, fFilterQuality));
 }
@@ skipping 289 matching lines @@
 }
 
 bool SkDebugCanvas::lastClipStackData(const SkPath& devPath) {
     if (fCalledAddStackData) {
         fClipStackData.appendf("<br>");
         addPathData(devPath, "pathOut");
         return true;
     }
     return false;
 }