added support for more features in JSON (blurs, dashing, different path fill types, etc.)

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 45 matching lines @@
 #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_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_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"
 #define SKJSONCANVAS_STYLE_STROKEANDFILL         "strokeAndFill"
 
-#define SKJSONCANVAS_EDGESTYLE_HARD              "hard"
-#define SKJSONCANVAS_EDGESTYLE_SOFT              "soft"
-
 #define SKJSONCANVAS_POINTMODE_POINTS            "points"
 #define SKJSONCANVAS_POINTMODE_LINES             "lines"
 #define SKJSONCANVAS_POINTMODE_POLYGON           "polygon"
 
 #define SKJSONCANVAS_REGIONOP_DIFFERENCE         "difference"
 #define SKJSONCANVAS_REGIONOP_INTERSECT          "intersect"
 #define SKJSONCANVAS_REGIONOP_UNION              "union"
 #define SKJSONCANVAS_REGIONOP_XOR                "xor"
 #define SKJSONCANVAS_REGIONOP_REVERSE_DIFFERENCE "reverseDifference"
 #define SKJSONCANVAS_REGIONOP_REPLACE            "replace"
 
+#define SKJSONCANVAS_BLURSTYLE_NORMAL            "normal"
+#define SKJSONCANVAS_BLURSTYLE_SOLID             "solid"
+#define SKJSONCANVAS_BLURSTYLE_OUTER             "outer"
+#define SKJSONCANVAS_BLURSTYLE_INNER             "inner"
+
+#define SKJSONCANVAS_BLURQUALITY_LOW             "low"
+#define SKJSONCANVAS_BLURQUALITY_HIGH            "high"
+
+#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"
+
 /* 
  * 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);
 
@@ skipping 101 matching lines @@
 
     SkWStream&  fOut;
     SkMatrix    fLastMatrix;
     Json::Value fRoot;
     Json::Value fCommands;
 
     typedef SkCanvas INHERITED;
 };
 
 #endif