support for more features when rendering to/from JSON

tools/json/SkJSONCanvas.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkJSONCanvas_DEFINED
 #define SkJSONCanvas_DEFINED
 
@@ skipping 27 matching lines @@
 #define SKJSONCANVAS_COMMAND_TEXTONPATH          "TextOnPath"
 #define SKJSONCANVAS_COMMAND_TEXTBLOB            "TextBlob"
 #define SKJSONCANVAS_COMMAND_PATCH               "Patch"
 #define SKJSONCANVAS_COMMAND_DRAWABLE            "Drawable"
 #define SKJSONCANVAS_COMMAND_CLIPRECT            "ClipRect"
 #define SKJSONCANVAS_COMMAND_CLIPRRECT           "ClipRRect"
 #define SKJSONCANVAS_COMMAND_CLIPPATH            "ClipPath"
 #define SKJSONCANVAS_COMMAND_CLIPREGION          "ClipRegion"
 #define SKJSONCANVAS_COMMAND_SAVE                "Save"
 #define SKJSONCANVAS_COMMAND_RESTORE             "Restore"
+#define SKJSONCANVAS_COMMAND_SAVELAYER           "SaveLayer"
 
 #define SKJSONCANVAS_ATTRIBUTE_MATRIX            "matrix"
 #define SKJSONCANVAS_ATTRIBUTE_COORDS            "coords"
+#define SKJSONCANVAS_ATTRIBUTE_BOUNDS            "bounds"
 #define SKJSONCANVAS_ATTRIBUTE_PAINT             "paint"
 #define SKJSONCANVAS_ATTRIBUTE_OUTER             "outer"
 #define SKJSONCANVAS_ATTRIBUTE_INNER             "inner"
 #define SKJSONCANVAS_ATTRIBUTE_MODE              "mode"
 #define SKJSONCANVAS_ATTRIBUTE_POINTS            "points"
 #define SKJSONCANVAS_ATTRIBUTE_PATH              "path"
 #define SKJSONCANVAS_ATTRIBUTE_TEXT              "text"
 #define SKJSONCANVAS_ATTRIBUTE_COLOR             "color"
 #define SKJSONCANVAS_ATTRIBUTE_STYLE             "style"
 #define SKJSONCANVAS_ATTRIBUTE_STROKEWIDTH       "strokeWidth"
+#define SKJSONCANVAS_ATTRIBUTE_STROKEMITER       "strokeMiter"
+#define SKJSONCANVAS_ATTRIBUTE_CAP               "cap"
 #define SKJSONCANVAS_ATTRIBUTE_ANTIALIAS         "antiAlias"
 #define SKJSONCANVAS_ATTRIBUTE_REGION            "region"
 #define SKJSONCANVAS_ATTRIBUTE_REGIONOP          "op"
 #define SKJSONCANVAS_ATTRIBUTE_EDGESTYLE         "edgeStyle"
 #define SKJSONCANVAS_ATTRIBUTE_DEVICEREGION      "deviceRegion"
 #define SKJSONCANVAS_ATTRIBUTE_BLUR              "blur"
 #define SKJSONCANVAS_ATTRIBUTE_SIGMA             "sigma"
 #define SKJSONCANVAS_ATTRIBUTE_QUALITY           "quality"
 #define SKJSONCANVAS_ATTRIBUTE_TEXTALIGN         "textAlign"
 #define SKJSONCANVAS_ATTRIBUTE_TEXTSIZE          "textSize"
 #define SKJSONCANVAS_ATTRIBUTE_TEXTSCALEX        "textScaleX"
 #define SKJSONCANVAS_ATTRIBUTE_TEXTSKEWX         "textSkewX"
 #define SKJSONCANVAS_ATTRIBUTE_DASHING           "dashing"
 #define SKJSONCANVAS_ATTRIBUTE_INTERVALS         "intervals"
 #define SKJSONCANVAS_ATTRIBUTE_PHASE             "phase"
 #define SKJSONCANVAS_ATTRIBUTE_FILLTYPE          "fillType"
 #define SKJSONCANVAS_ATTRIBUTE_VERBS             "verbs"
+#define SKJSONCANVAS_ATTRIBUTE_NAME              "name"
+#define SKJSONCANVAS_ATTRIBUTE_BYTES             "bytes"
+#define SKJSONCANVAS_ATTRIBUTE_SHADER            "shader"
+#define SKJSONCANVAS_ATTRIBUTE_PATHEFFECT        "pathEffect"
+#define SKJSONCANVAS_ATTRIBUTE_MASKFILTER        "maskFilter"
+#define SKJSONCANVAS_ATTRIBUTE_XFERMODE          "xfermode"
+#define SKJSONCANVAS_ATTRIBUTE_BACKDROP          "backdrop"
+#define SKJSONCANVAS_ATTRIBUTE_IMAGE             "image"
+#define SKJSONCANVAS_ATTRIBUTE_BITMAP            "bitmap"
+#define SKJSONCANVAS_ATTRIBUTE_SRC               "src"
+#define SKJSONCANVAS_ATTRIBUTE_DST               "dst"
+#define SKJSONCANVAS_ATTRIBUTE_STRICT            "strict"
+#define SKJSONCANVAS_ATTRIBUTE_DESCRIPTION       "description"
 
 #define SKJSONCANVAS_VERB_MOVE                   "move"
 #define SKJSONCANVAS_VERB_LINE                   "line"
 #define SKJSONCANVAS_VERB_QUAD                   "quad"
 #define SKJSONCANVAS_VERB_CUBIC                  "cubic"
 #define SKJSONCANVAS_VERB_CONIC                  "conic"
 #define SKJSONCANVAS_VERB_CLOSE                  "close"
 
 #define SKJSONCANVAS_STYLE_FILL                  "fill"
 #define SKJSONCANVAS_STYLE_STROKE                "stroke"
@@ skipping 20 matching lines @@
 
 #define SKJSONCANVAS_ALIGN_LEFT                  "left"
 #define SKJSONCANVAS_ALIGN_CENTER                "center"
 #define SKJSONCANVAS_ALIGN_RIGHT                 "right"
 
 #define SKJSONCANVAS_FILLTYPE_WINDING            "winding"
 #define SKJSONCANVAS_FILLTYPE_EVENODD            "evenOdd"
 #define SKJSONCANVAS_FILLTYPE_INVERSEWINDING     "inverseWinding"
 #define SKJSONCANVAS_FILLTYPE_INVERSEEVENODD     "inverseEvenOdd"
 
+#define SKJSONCANVAS_CAP_BUTT                    "butt"
+#define SKJSONCANVAS_CAP_ROUND                   "round"
+#define SKJSONCANVAS_CAP_SQUARE                  "square"
+
 /* 
  * Implementation of SkCanvas which writes JSON when drawn to. The JSON describes all of the draw
  * commands issued to the canvas, and can later be turned back into draw commands using 
  * SkJSONRenderer. Be sure to call finish() when you are done drawing.
  */
 class SkJSONCanvas : public SkCanvas {
 public:
     /* Create a canvas which writes to the specified output stream. */
-    SkJSONCanvas(int width, int height, SkWStream& out);
+    SkJSONCanvas(int width, int height, SkWStream& out, bool sendBinaries = false);
 
     /* Complete the JSON document. */
     void finish();
 
     // overridden SkCanvas API
 
     void onDrawPaint(const SkPaint&) override;
 
     void onDrawRect(const SkRect&, const SkPaint&) override;
 
@@ skipping 58 matching lines @@
     void onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) override;
 
     void onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) override;
 
     void onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) override;
 
     void willSave() override;
 
     void willRestore() override;
 
+    SkCanvas::SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec& rec) override;
+
 private:
     Json::Value makePoint(const SkPoint& point);
 
     Json::Value makePoint(SkScalar x, SkScalar y);
 
     Json::Value makeRect(const SkRect& rect);
 
     Json::Value makeRRect(const SkRRect& rrect);
 
     Json::Value makePath(const SkPath& path);
 
     Json::Value makeRegion(const SkRegion& region);
   
     Json::Value makePaint(const SkPaint& paint);
   
     Json::Value makeRegionOp(SkRegion::Op op);
   
     Json::Value makeEdgeStyle(SkCanvas::ClipEdgeStyle edgeStyle);
   
     Json::Value makePointMode(SkCanvas::PointMode mode);
   
     Json::Value makeMatrix(const SkMatrix& matrix);
   
     void updateMatrix();
 
     SkWStream&  fOut;
     SkMatrix    fLastMatrix;
     Json::Value fRoot;
     Json::Value fCommands;
+    bool        fSendBinaries;
 
     typedef SkCanvas INHERITED;
 };
 
 #endif