Improved support for images/bitmaps in SkJSONCanvas

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 40 matching lines @@
 #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_ALPHA             "alpha"
 #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_IMAGEFILTER       "imagefilter"
 #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"
@@ skipping 30 matching lines @@
 
 #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"
 
+#define SKJSONCANVAS_COLORTYPE_ARGB4444          "ARGB4444"
+#define SKJSONCANVAS_COLORTYPE_RGBA8888          "RGBA8888"
+#define SKJSONCANVAS_COLORTYPE_BGRA8888          "BGRA8888"
+#define SKJSONCANVAS_COLORTYPE_565               "565"
+#define SKJSONCANVAS_COLORTYPE_GRAY8             "Gray8"
+#define SKJSONCANVAS_COLORTYPE_INDEX8            "Index8"
+#define SKJSONCANVAS_COLORTYPE_ALPHA8            "Alpha8"
+
+#define SKJSONCANVAS_ALPHATYPE_OPAQUE            "opaque"
+#define SKJSONCANVAS_ALPHATYPE_PREMUL            "premul"
+#define SKJSONCANVAS_ALPHATYPE_UNPREMUL          "unpremul"
+
 /* 
  * 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, bool sendBinaries = false);
 
@@ skipping 104 matching lines @@
     SkWStream&  fOut;
     SkMatrix    fLastMatrix;
     Json::Value fRoot;
     Json::Value fCommands;
     bool        fSendBinaries;
 
     typedef SkCanvas INHERITED;
 };
 
 #endif