Fix some bugs and performance issues with skiaserve

tools/debugger/SkDebugCanvas.h

Index: tools/debugger/SkDebugCanvas.h
diff --git a/tools/debugger/SkDebugCanvas.h b/tools/debugger/SkDebugCanvas.h
index 7379698f20bdf73fa3899ce2eba538e33c06d227..fa02874779a737f7940d0375d8d6ab7062810104 100644
--- a/tools/debugger/SkDebugCanvas.h
+++ b/tools/debugger/SkDebugCanvas.h
@@ -19,6 +19,7 @@
 #include "SkTArray.h"
 #include "UrlDataManager.h"
 
+class GrAuditTrail;
 class SkNWayCanvas;
 
 class SK_API SkDebugCanvas : public SkCanvas {
@@ -160,6 +161,8 @@ public:
      */
     Json::Value toJSON(UrlDataManager& urlDataManager, int n, SkCanvas*);
 
+    Json::Value toJSONBatchList(int n, SkCanvas*);
+
 ////////////////////////////////////////////////////////////////////////////////
 // Inherited from SkCanvas
 ////////////////////////////////////////////////////////////////////////////////
@@ -284,7 +287,11 @@ private:
     void outputPointsCommon(const SkPoint* pts, int count);
     void outputScalar(SkScalar num);
 
+    GrAuditTrail* getAuditTrail(SkCanvas*);
+
     void updatePaintFilterCanvas();
+    void drawAndCollectBatches(int n, SkCanvas*);
+    void cleanupAuditTrail(SkCanvas*);
 
     typedef SkCanvas INHERITED;
 };