Revert of Moved Canvas->JSON and JSON->Canvas functionality into SkDebugCanvas.

tools/debugger/SkDrawCommand.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 SKDRAWCOMMAND_H_
 #define SKDRAWCOMMAND_H_
 
 #include "SkCanvas.h"
 #include "SkTLazy.h"
 #include "SkPath.h"
 #include "SkRRect.h"
 #include "SkString.h"
 #include "SkTDArray.h"
-#include "SkJSONCPP.h"
 
 class SK_API SkDrawCommand {
 public:
     enum OpType {
         kBeginDrawPicture_OpType,
         kClipPath_OpType,
         kClipRegion_OpType,
         kClipRect_OpType,
         kClipRRect_OpType,
         kConcat_OpType,
@@ skipping 64 matching lines @@
         kPushLayer_Action,
     };
     virtual Action action() const { return kNone_Action; }
     virtual void setActive(bool active) {}
     virtual bool active() const { return false; }
 
     OpType getType() const { return fOpType; }
 
     virtual bool render(SkCanvas* canvas) const { return false; }
 
-    virtual Json::Value toJSON() const;
-
-    /* Converts a JSON representation of a command into a newly-allocated SkDrawCommand object. It
-     * is the caller's responsibility to delete this object. This method may return null if an error
-     * occurs.
-     */
-    static SkDrawCommand* fromJSON(Json::Value& command);
-
     static const char* GetCommandString(OpType type);
 
 protected:
     SkTDArray<SkString*> fInfo;
 
 private:
     OpType fOpType;
     bool   fVisible;
 };
 
 class SkRestoreCommand : public SkDrawCommand {
 public:
     SkRestoreCommand();
     void execute(SkCanvas* canvas) const override;
     Action action() const override { return kPopLayer_Action; }
-    static SkRestoreCommand* fromJSON(Json::Value& command);
 
 private:
     typedef SkDrawCommand INHERITED;
 };
 
 class SkClearCommand : public SkDrawCommand {
 public:
     SkClearCommand(SkColor color);
     void execute(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkClearCommand* fromJSON(Json::Value& command);
-
 private:
     SkColor fColor;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkClipPathCommand : public SkDrawCommand {
 public:
     SkClipPathCommand(const SkPath& path, SkRegion::Op op, bool doAA);
     void execute(SkCanvas* canvas) const override;
     bool render(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkClipPathCommand* fromJSON(Json::Value& command);
-
 private:
     SkPath       fPath;
     SkRegion::Op fOp;
     bool         fDoAA;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkClipRegionCommand : public SkDrawCommand {
 public:
     SkClipRegionCommand(const SkRegion& region, SkRegion::Op op);
     void execute(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkClipRegionCommand* fromJSON(Json::Value& command);
-
 private:
     SkRegion     fRegion;
     SkRegion::Op fOp;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkClipRectCommand : public SkDrawCommand {
 public:
     SkClipRectCommand(const SkRect& rect, SkRegion::Op op, bool doAA);
     void execute(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkClipRectCommand* fromJSON(Json::Value& command);
 
     const SkRect& rect() const { return fRect; }
     SkRegion::Op op() const { return fOp; }
     bool doAA() const { return fDoAA; }
 
 private:
     SkRect       fRect;
     SkRegion::Op fOp;
     bool         fDoAA;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkClipRRectCommand : public SkDrawCommand {
 public:
     SkClipRRectCommand(const SkRRect& rrect, SkRegion::Op op, bool doAA);
     void execute(SkCanvas* canvas) const override;
     bool render(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkClipRRectCommand* fromJSON(Json::Value& command);
 
     const SkRRect& rrect() const { return fRRect; }
     SkRegion::Op op() const { return fOp; }
     bool doAA() const { return fDoAA; }
 
 private:
     SkRRect      fRRect;
     SkRegion::Op fOp;
     bool         fDoAA;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkConcatCommand : public SkDrawCommand {
 public:
     SkConcatCommand(const SkMatrix& matrix);
     void execute(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkConcatCommand* fromJSON(Json::Value& command);
-
 private:
     SkMatrix fMatrix;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawBitmapCommand : public SkDrawCommand {
 public:
     SkDrawBitmapCommand(const SkBitmap& bitmap, SkScalar left, SkScalar top,
                         const SkPaint* paint);
     void execute(SkCanvas* canvas) const override;
     bool render(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawBitmapCommand* fromJSON(Json::Value& command);
-
 private:
     SkBitmap fBitmap;
     SkScalar fLeft;
     SkScalar fTop;
     SkPaint  fPaint;
     SkPaint* fPaintPtr;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawBitmapNineCommand : public SkDrawCommand {
 public:
     SkDrawBitmapNineCommand(const SkBitmap& bitmap, const SkIRect& center,
                             const SkRect& dst, const SkPaint* paint);
     void execute(SkCanvas* canvas) const override;
     bool render(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawBitmapNineCommand* fromJSON(Json::Value& command);
-
 private:
     SkBitmap fBitmap;
     SkIRect  fCenter;
     SkRect   fDst;
     SkPaint  fPaint;
     SkPaint* fPaintPtr;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawBitmapRectCommand : public SkDrawCommand {
 public:
     SkDrawBitmapRectCommand(const SkBitmap& bitmap, const SkRect* src,
                             const SkRect& dst, const SkPaint* paint,
                             SkCanvas::SrcRectConstraint);
     void execute(SkCanvas* canvas) const override;
     bool render(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawBitmapRectCommand* fromJSON(Json::Value& command);
 
     const SkBitmap& bitmap() const { return fBitmap; }
 
     // The non-const 'paint' method allows modification of this object's
     // SkPaint. For this reason the ctor and setPaint method make a local copy.
     // The 'fPaintPtr' member acts a signal that the local SkPaint is valid
     // (since only an SkPaint* is passed into the ctor).
     const SkPaint* paint() const { return fPaintPtr; }
     SkPaint* paint() { return fPaintPtr; }
 
@@ skipping 17 matching lines @@
     SkCanvas::SrcRectConstraint   fConstraint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawImageCommand : public SkDrawCommand {
 public:
     SkDrawImageCommand(const SkImage* image, SkScalar left, SkScalar top, const SkPaint* paint);
     void execute(SkCanvas* canvas) const override;
     bool render(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawImageCommand* fromJSON(Json::Value& command);
-
 private:
     SkAutoTUnref<const SkImage> fImage;
     SkScalar                    fLeft;
     SkScalar                    fTop;
     SkTLazy<SkPaint>            fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawImageRectCommand : public SkDrawCommand {
 public:
     SkDrawImageRectCommand(const SkImage* image, const SkRect* src, const SkRect& dst,
                            const SkPaint* paint, SkCanvas::SrcRectConstraint constraint);
     void execute(SkCanvas* canvas) const override;
     bool render(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawImageRectCommand* fromJSON(Json::Value& command);
-
 private:
     SkAutoTUnref<const SkImage> fImage;
     SkTLazy<SkRect>             fSrc;
     SkRect                      fDst;
     SkTLazy<SkPaint>            fPaint;
     SkCanvas::SrcRectConstraint fConstraint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawOvalCommand : public SkDrawCommand {
 public:
     SkDrawOvalCommand(const SkRect& oval, const SkPaint& paint);
     void execute(SkCanvas* canvas) const override;
     bool render(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawOvalCommand* fromJSON(Json::Value& command);
-
 private:
     SkRect  fOval;
     SkPaint fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawPaintCommand : public SkDrawCommand {
 public:
     SkDrawPaintCommand(const SkPaint& paint);
     void execute(SkCanvas* canvas) const override;
     bool render(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawPaintCommand* fromJSON(Json::Value& command);
-
 private:
     SkPaint fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawPathCommand : public SkDrawCommand {
 public:
     SkDrawPathCommand(const SkPath& path, const SkPaint& paint);
     void execute(SkCanvas* canvas) const override;
     bool render(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawPathCommand* fromJSON(Json::Value& command);
 
 private:
     SkPath   fPath;
     SkPaint  fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkBeginDrawPictureCommand : public SkDrawCommand {
 public:
@@ skipping 24 matching lines @@
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawPointsCommand : public SkDrawCommand {
 public:
     SkDrawPointsCommand(SkCanvas::PointMode mode, size_t count, const SkPoint pts[],
                         const SkPaint& paint);
     virtual ~SkDrawPointsCommand() { delete [] fPts; }
     void execute(SkCanvas* canvas) const override;
     bool render(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawPointsCommand* fromJSON(Json::Value& command);
-
 private:
     SkCanvas::PointMode fMode;
     size_t              fCount;
     SkPoint*            fPts;
     SkPaint             fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawTextCommand : public SkDrawCommand {
 public:
     SkDrawTextCommand(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                       const SkPaint& paint);
     virtual ~SkDrawTextCommand() { delete [] fText; }
     void execute(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawTextCommand* fromJSON(Json::Value& command);
-
 private:
     char*    fText;
     size_t   fByteLength;
     SkScalar fX;
     SkScalar fY;
     SkPaint  fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawPosTextCommand : public SkDrawCommand {
 public:
     SkDrawPosTextCommand(const void* text, size_t byteLength, const SkPoint pos[],
                          const SkPaint& paint);
     virtual ~SkDrawPosTextCommand() { delete [] fPos; delete [] fText; }
     void execute(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawPosTextCommand* fromJSON(Json::Value& command);
-
 private:
     char*    fText;
     size_t   fByteLength;
     SkPoint* fPos;
     SkPaint  fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawTextOnPathCommand : public SkDrawCommand {
 public:
     SkDrawTextOnPathCommand(const void* text, size_t byteLength, const SkPath& path,
                             const SkMatrix* matrix, const SkPaint& paint);
     virtual ~SkDrawTextOnPathCommand() { delete [] fText; }
     void execute(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawTextOnPathCommand* fromJSON(Json::Value& command);
-
 private:
     char*    fText;
     size_t   fByteLength;
     SkPath   fPath;
     SkMatrix fMatrix;
     SkPaint  fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawPosTextHCommand : public SkDrawCommand {
 public:
     SkDrawPosTextHCommand(const void* text, size_t byteLength, const SkScalar xpos[],
                           SkScalar constY, const SkPaint& paint);
     virtual ~SkDrawPosTextHCommand() { delete [] fXpos; delete [] fText; }
     void execute(SkCanvas* canvas) const override;
-
 private:
     SkScalar* fXpos;
     char*     fText;
     size_t    fByteLength;
     SkScalar  fConstY;
     SkPaint   fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawTextBlobCommand : public SkDrawCommand {
 public:
     SkDrawTextBlobCommand(const SkTextBlob* blob, SkScalar x, SkScalar y, const SkPaint& paint);
 
     void execute(SkCanvas* canvas) const override;
     bool render(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawTextBlobCommand* fromJSON(Json::Value& command);
 
 private:
     SkAutoTUnref<const SkTextBlob> fBlob;
     SkScalar                       fXPos;
     SkScalar                       fYPos;
     SkPaint                        fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
@@ skipping 12 matching lines @@
     SkPaint fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 
 class SkDrawRectCommand : public SkDrawCommand {
 public:
     SkDrawRectCommand(const SkRect& rect, const SkPaint& paint);
     void execute(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawRectCommand* fromJSON(Json::Value& command);
 
     const SkRect& rect() const   { return fRect; }
     const SkPaint& paint() const { return fPaint; }
 private:
     SkRect  fRect;
     SkPaint fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawRRectCommand : public SkDrawCommand {
 public:
     SkDrawRRectCommand(const SkRRect& rrect, const SkPaint& paint);
     void execute(SkCanvas* canvas) const override;
     bool render(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawRRectCommand* fromJSON(Json::Value& command);
-
 private:
     SkRRect fRRect;
     SkPaint fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawDRRectCommand : public SkDrawCommand {
 public:
     SkDrawDRRectCommand(const SkRRect& outer, const SkRRect& inner,
                         const SkPaint& paint);
     void execute(SkCanvas* canvas) const override;
     bool render(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkDrawDRRectCommand* fromJSON(Json::Value& command);
-
 private:
     SkRRect fOuter;
     SkRRect fInner;
     SkPaint fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkDrawVerticesCommand : public SkDrawCommand {
 public:
     SkDrawVerticesCommand(SkCanvas::VertexMode vmode, int vertexCount,
                           const SkPoint vertices[], const SkPoint texs[],
                           const SkColor colors[], SkXfermode* xfermode,
                           const uint16_t indices[], int indexCount,
                           const SkPaint& paint);
     virtual ~SkDrawVerticesCommand();
     void execute(SkCanvas* canvas) const override;
-
 private:
     SkCanvas::VertexMode fVmode;
     int         fVertexCount;
     SkPoint*    fVertices;
     SkPoint*    fTexs;
     SkColor*    fColors;
     SkXfermode* fXfermode;
     uint16_t*   fIndices;
     int         fIndexCount;
     SkPaint     fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkSaveCommand : public SkDrawCommand {
 public:
     SkSaveCommand();
     void execute(SkCanvas* canvas) const override;
     Action action() const override { return kPushLayer_Action; }
-    static SkSaveCommand* fromJSON(Json::Value& command);
-
 private:
     typedef SkDrawCommand INHERITED;
 };
 
 class SkSaveLayerCommand : public SkDrawCommand {
 public:
     SkSaveLayerCommand(const SkCanvas::SaveLayerRec&);
-    virtual ~SkSaveLayerCommand();
     void execute(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkSaveLayerCommand* fromJSON(Json::Value& command);
     void vizExecute(SkCanvas* canvas) const override;
     Action action() const override{ return kPushLayer_Action; }
     void setActive(bool active) override { fActive = active; }
     bool active() const override { return fActive; }
 
     const SkPaint* paint() const { return fPaintPtr; }
 
 private:
-    SkRect               fBounds;
-    SkPaint              fPaint;
-    SkPaint*             fPaintPtr;
-    const SkImageFilter* fBackdrop;
-    uint32_t       fSaveLayerFlags;
+    SkRect      fBounds;
+    SkPaint     fPaint;
+    SkPaint*    fPaintPtr;
+    uint32_t    fSaveLayerFlags;
 
     bool        fActive;
 
     typedef SkDrawCommand INHERITED;
 };
 
 class SkSetMatrixCommand : public SkDrawCommand {
 public:
     SkSetMatrixCommand(const SkMatrix& matrix);
     void setUserMatrix(const SkMatrix&) override;
     void execute(SkCanvas* canvas) const override;
-    Json::Value toJSON() const override;
-    static SkSetMatrixCommand* fromJSON(Json::Value& command);
-
 private:
     SkMatrix fUserMatrix;
     SkMatrix fMatrix;
 
     typedef SkDrawCommand INHERITED;
 };
 
 #endif