commit bd72413059d913ceddbf5cd29327c05b13a62503
author joshualitt <joshualitt@chromium.org> Thu Mar 03 11:39:38 2016 -0800
committer Commit bot <commit-bot@chromium.org> Thu Mar 03 11:39:39 2016 -0800
tree c266e9241bcbb330cdacf63a25109614fde65be0
parent 862110042d715214b484e643194336c0f0b28659

Remove dependency on SkJsonCanvas.h

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748183007
NOTRY=True

Review URL: https://codereview.chromium.org/1748183007

tools/skiaserve/Request.cpp

diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp
index 8ffcc36..46e3039 100644
--- a/tools/skiaserve/Request.cpp
+++ b/tools/skiaserve/Request.cpp
@@ -9,8 +9,6 @@
 
 #include "png.h"
 
-#include "SkJSONCanvas.h"
-
 const int Request::kImageWidth = 1920;
 const int Request::kImageHeight = 1080;
 
@@ -228,8 +226,8 @@
     SkMatrix vm = fDebugCanvas->getCurrentMatrix();
     SkIRect clip = fDebugCanvas->getCurrentClip();
     Json::Value info(Json::objectValue);
-    info["ViewMatrix"] = SkJSONCanvas::MakeMatrix(vm);
-    info["ClipRect"] = SkJSONCanvas::MakeIRect(clip);
+    info["ViewMatrix"] = SkDrawCommand::MakeJsonMatrix(vm);
+    info["ClipRect"] = SkDrawCommand::MakeJsonIRect(clip);
 
     std::string json = Json::FastWriter().write(info);