Fix some bugs and performance issues with skiaserve

tools/debugger/SkDebugCanvas.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SKDEBUGCANVAS_H_
 #define SKDEBUGCANVAS_H_
 
 #include "SkCanvas.h"
 #include "SkDrawCommand.h"
 #include "SkPath.h"
 #include "SkPathOps.h"
 #include "SkPicture.h"
 #include "SkString.h"
 #include "SkTArray.h"
 #include "UrlDataManager.h"
 
+class GrAuditTrail;
 class SkNWayCanvas;
 
 class SK_API SkDebugCanvas : public SkCanvas {
 public:
     SkDebugCanvas(int width, int height);
     virtual ~SkDebugCanvas();
 
     void toggleFilter(bool toggle) { fFilter = toggle; }
 
     void setMegaVizMode(bool megaVizMode) { fMegaVizMode = megaVizMode; }
@@ skipping 121 matching lines @@
 
     SkString clipStackData() const { return fClipStackData; }
 
     /**
         Returns a JSON object representing up to the Nth draw, where N is less than
         SkDebugCanvas::getSize(). The encoder may use the UrlDataManager to store binary data such 
         as images, referring to them via URLs embedded in the JSON.
      */
     Json::Value toJSON(UrlDataManager& urlDataManager, int n, SkCanvas*);
 
+    Json::Value toJSONBatchList(int n, SkCanvas*);
+
 ////////////////////////////////////////////////////////////////////////////////
 // Inherited from SkCanvas
 ////////////////////////////////////////////////////////////////////////////////
 
     static const int kVizImageHeight = 256;
     static const int kVizImageWidth = 256;
 
     bool isClipEmpty() const override { return false; }
     bool isClipRect() const override { return true; }
     bool getClipBounds(SkRect* bounds) const override {
@@ skipping 104 matching lines @@
     void resetClipStackData() { fClipStackData.reset(); fCalledAddStackData = false; }
 
     void addClipStackData(const SkPath& devPath, const SkPath& operand, SkRegion::Op elementOp);
     void addPathData(const SkPath& path, const char* pathName);
     bool lastClipStackData(const SkPath& devPath);
     void outputConicPoints(const SkPoint* pts, SkScalar weight);
     void outputPoints(const SkPoint* pts, int count);
     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;
 };
 
 #endif