JSON API cleanups

tools/json/SkJSONCanvas.h

Index: tools/json/SkJSONCanvas.h
diff --git a/tools/json/SkJSONCanvas.h b/tools/json/SkJSONCanvas.h
index 2e016df93787f09646b3d85acdd70334882e0f62..b43606447bdb815e606316e8979bb2dd27e87ab2 100644
--- a/tools/json/SkJSONCanvas.h
+++ b/tools/json/SkJSONCanvas.h
@@ -16,6 +16,8 @@
 #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"
@@ -94,6 +96,8 @@
 #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"
@@ -169,6 +173,10 @@ public:
 
     // 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;
@@ -268,7 +276,6 @@ private:
     void updateMatrix();
 
     SkWStream&  fOut;
-    SkMatrix    fLastMatrix;
     Json::Value fRoot;
     Json::Value fCommands;
     bool        fSendBinaries;