Modify skia serve to return clip rect and view matrix

tools/json/SkJSONCanvas.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkJSONCanvas.h"
 #include "SkImageFilter.h"
 #include "SkMaskFilter.h"
@@ skipping 364 matching lines @@
     apply_paint_style(paint, &result);
     apply_paint_cap(paint, &result);
     apply_paint_textalign(paint, &result);
     apply_paint_patheffect(paint, &result, fSendBinaries);
     apply_paint_maskfilter(paint, &result, fSendBinaries);
     apply_paint_shader(paint, &result, fSendBinaries);
     apply_paint_xfermode(paint, &result, fSendBinaries);
     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]));
     row1.append(Json::Value(matrix[1]));
     row1.append(Json::Value(matrix[2]));
     result.append(row1);
     Json::Value row2(Json::arrayValue);
     row2.append(Json::Value(matrix[3]));
     row2.append(Json::Value(matrix[4]));
     row2.append(Json::Value(matrix[5]));
@@ skipping 38 matching lines @@
             SkASSERT(false);
             return Json::Value("<invalid point mode>");
     };
 }
 
 void SkJSONCanvas::updateMatrix() {
     const SkMatrix& matrix = this->getTotalMatrix();
     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;
     }
 }
 
 void SkJSONCanvas::onDrawPaint(const SkPaint& paint) {
     Json::Value command(Json::objectValue);
     command[SKJSONCANVAS_COMMAND] = Json::Value(SKJSONCANVAS_COMMAND_PAINT);
     command[SKJSONCANVAS_ATTRIBUTE_PAINT] = this->makePaint(paint);
     fCommands.append(command);
@@ skipping 277 matching lines @@
         Json::Value backdrop;
         flatten(rec.fBackdrop, &backdrop, fSendBinaries);
         command[SKJSONCANVAS_ATTRIBUTE_BACKDROP] = backdrop;
     }
     if (rec.fSaveLayerFlags != 0) {
         SkDebugf("unsupported: saveLayer flags\n");
     }
     fCommands.append(command);
     return this->INHERITED::getSaveLayerStrategy(rec);
 }