aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/json/SkJSONCanvas.cpp
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2016-02-04 06:08:33 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-04 06:08:33 -0800
commit29e5a8932d7dae782f2e58d312a038f8888dab30 (patch)
treebadc6423cefb9df2da87c1a2a44e02db53ce0744 /tools/json/SkJSONCanvas.cpp
parenta3d99a515bb379b60c38189de435b47bdc8dd528 (diff)
Modify skia serve to return clip rect and view matrix
Diffstat (limited to 'tools/json/SkJSONCanvas.cpp')
-rw-r--r--tools/json/SkJSONCanvas.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/tools/json/SkJSONCanvas.cpp b/tools/json/SkJSONCanvas.cpp
index efc4acd1a3..2272f88152 100644
--- a/tools/json/SkJSONCanvas.cpp
+++ b/tools/json/SkJSONCanvas.cpp
@@ -382,7 +382,16 @@ Json::Value SkJSONCanvas::makePaint(const SkPaint& paint) {
return result;
}
-Json::Value SkJSONCanvas::makeMatrix(const SkMatrix& matrix) {
+Json::Value SkJSONCanvas::MakeIRect(const SkIRect& rect) {
+ Json::Value result(Json::arrayValue);
+ result.append(Json::Value(rect.left()));
+ result.append(Json::Value(rect.top()));
+ result.append(Json::Value(rect.right()));
+ result.append(Json::Value(rect.bottom()));
+ return result;
+}
+
+Json::Value SkJSONCanvas::MakeMatrix(const SkMatrix& matrix) {
Json::Value result(Json::arrayValue);
Json::Value row1(Json::arrayValue);
row1.append(Json::Value(matrix[0]));
@@ -441,7 +450,7 @@ void SkJSONCanvas::updateMatrix() {
if (matrix != fLastMatrix) {
Json::Value command(Json::objectValue);
command[SKJSONCANVAS_COMMAND] = Json::Value(SKJSONCANVAS_COMMAND_MATRIX);
- command[SKJSONCANVAS_ATTRIBUTE_MATRIX] = this->makeMatrix(matrix);
+ command[SKJSONCANVAS_ATTRIBUTE_MATRIX] = MakeMatrix(matrix);
fCommands.append(command);
fLastMatrix = matrix;
}