JSON API cleanups

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
 
 #include "SkCanvas.h"
 #include "SkStream.h"
 #include "SkJSONCPP.h"
 
 #define SKJSONCANVAS_VERSION                     "version"
 #define SKJSONCANVAS_COMMANDS                    "commands"
 #define SKJSONCANVAS_COMMAND                     "command"
 
+#define SKJSONCANVAS_COMMAND_TRANSLATE           "Translate"
+#define SKJSONCANVAS_COMMAND_SCALE               "Scale"
 #define SKJSONCANVAS_COMMAND_MATRIX              "Matrix"
 #define SKJSONCANVAS_COMMAND_PAINT               "Paint"
 #define SKJSONCANVAS_COMMAND_RECT                "Rect"
 #define SKJSONCANVAS_COMMAND_OVAL                "Oval"
 #define SKJSONCANVAS_COMMAND_RRECT               "RRect"
 #define SKJSONCANVAS_COMMAND_DRRECT              "DRRect"
 #define SKJSONCANVAS_COMMAND_POINTS              "Points"
 #define SKJSONCANVAS_COMMAND_VERTICES            "Vertices"
 #define SKJSONCANVAS_COMMAND_ATLAS               "Atlas"
 #define SKJSONCANVAS_COMMAND_PATH                "Path"
@@ skipping 58 matching lines @@
 #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_ATTRIBUTE_X                 "x"
+#define SKJSONCANVAS_ATTRIBUTE_Y                 "y"
 
 #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 55 matching lines @@
 
     /* Complete the JSON document. */
     void finish();
 
     static Json::Value MakeMatrix(const SkMatrix& matrix);
 
     static Json::Value MakeIRect(const SkIRect& irect);
 
     // overridden SkCanvas API
 
+    void didConcat(const SkMatrix&) override;
+
+    void didSetMatrix(const SkMatrix&) override;
+
     void onDrawPaint(const SkPaint&) override;
 
     void onDrawRect(const SkRect&, const SkPaint&) override;
 
     void onDrawOval(const SkRect&, const SkPaint&) override;
 
     void onDrawRRect(const SkRRect&, const SkPaint&) override;
 
     void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
 
@@ skipping 79 matching lines @@
   
     Json::Value makeRegionOp(SkRegion::Op op);
   
     Json::Value makeEdgeStyle(SkCanvas::ClipEdgeStyle edgeStyle);
   
     Json::Value makePointMode(SkCanvas::PointMode mode);
 
     void updateMatrix();
 
     SkWStream&  fOut;
-    SkMatrix    fLastMatrix;
     Json::Value fRoot;
     Json::Value fCommands;
     bool        fSendBinaries;
 
     typedef SkCanvas INHERITED;
 };
 
 #endif