Modify skia serve to return clip rect and view matrix

tools/skiaserve/skiaserve.cpp

Index: tools/skiaserve/skiaserve.cpp
diff --git a/tools/skiaserve/skiaserve.cpp b/tools/skiaserve/skiaserve.cpp
index fad8aa4acec211b6bc7eab81f3e07a99a28eb5fe..fd136939a1ba31c4b815dfb28cd4cd1a0bd94815 100644
--- a/tools/skiaserve/skiaserve.cpp
+++ b/tools/skiaserve/skiaserve.cpp
@@ -11,6 +11,7 @@
 #include "SkCommandLineFlags.h"
 #include "SkDebugCanvas.h"
 #include "SkJSONCanvas.h"
+#include "SkJSONCPP.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
 #include "SkPixelSerializer.h"
@@ -117,6 +118,12 @@ SkData* setupAndDrawToCanvasReturnPng(SkDebugCanvas* debugCanvas, int n) {
     return writeCanvasToPng(canvas);
 }
 
+SkSurface* setupCpuSurface() {
+    SkImageInfo info = SkImageInfo::Make(kImageWidth, kImageHeight, kN32_SkColorType,
+                                         kPremul_SkAlphaType);
+    return SkSurface::NewRaster(info);
+}
+
 static const size_t kBufferSize = 1024;
 
 static int process_upload_data(void* cls, enum MHD_ValueKind kind,
@@ -188,7 +195,7 @@ public:
                        const char* upload_data, size_t* upload_data_size) = 0;
 };
 
-class InfoHandler : public UrlHandler {
+class CmdHandler : public UrlHandler {
 public:
     bool canHandle(const char* method, const char* url) override {
         const char* kBasePath = "/cmd";
@@ -356,6 +363,51 @@ public:
     }
 };
 
+class InfoHandler : public UrlHandler {
+public:
+    bool canHandle(const char* method, const char* url) override {
+        const char* kBaseName = "/info";
+        return 0 == strcmp(method, MHD_HTTP_METHOD_GET) &&
+               0 == strncmp(url, kBaseName, strlen(kBaseName));
+    }
+
+    int handle(Request* request, MHD_Connection* connection,
+               const char* url, const char* method,
+               const char* upload_data, size_t* upload_data_size) override {
+        SkTArray<SkString> commands;
+        SkStrSplit(url, "/", &commands);
+
+        if (!request->fPicture.get() || commands.count() > 2) {
+            return MHD_NO;
+        }
+
+        // drawTo
+        SkAutoTUnref<SkSurface> surface(setupCpuSurface());
+        SkCanvas* canvas = surface->getCanvas();
+
+        int n;
+        // /info or /info/N
+        if (commands.count() == 1) {
+            n = request->fDebugCanvas->getSize() - 1;
+        } else {
+            sscanf(commands[1].c_str(), "%d", &n);
+        }
+
+        request->fDebugCanvas->drawTo(canvas, n);

[jcgregorio, 2016/02/03 19:59:53]

Yeah, I think caching the matrix and clip for /info/N calls will be needed in
the future, since we'll be rendering the skp twice for each step as we move
through the commands. Maybe just add a TODO for now?

[joshualitt, 2016/02/04 13:41:37]

Acknowledged.

+
+        // make some json
+        SkMatrix vm = request->fDebugCanvas->getCurrentMatrix();
+        SkIRect clip = request->fDebugCanvas->getCurrentClip();
+        Json::Value info(Json::objectValue);
+        info["ViewMatrix"] = SkJSONCanvas::MakeMatrix(vm);
+        info["ClipRect"] = SkJSONCanvas::MakeIRect(clip);
+
+        SkAutoTUnref<SkData> data(SkData::NewWithCString(Json::FastWriter().write(info).c_str()));
+        return SendData(connection, data, "application/json");
+    }
+};
+
+
 class RootHandler : public UrlHandler {
 public:
     bool canHandle(const char* method, const char* url) override {
@@ -377,6 +429,7 @@ public:
         fHandlers.push_back(new RootHandler);
         fHandlers.push_back(new PostHandler);
         fHandlers.push_back(new ImgHandler);
+        fHandlers.push_back(new CmdHandler);
         fHandlers.push_back(new InfoHandler);
         fHandlers.push_back(new DownloadHandler);
     }