Remove dependency on SkJsonCanvas.h

tools/skiaserve/Request.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 "Request.h"
 
 #include "png.h"
 
-#include "SkJSONCanvas.h"
-
 const int Request::kImageWidth = 1920;
 const int Request::kImageHeight = 1080;
 
 static void write_png_callback(png_structp png_ptr, png_bytep data, png_size_t length) {
     SkWStream* out = (SkWStream*) png_get_io_ptr(png_ptr);
     out->write(data, length);
 }
 
 static void write_png(const png_bytep rgba, png_uint_32 width, png_uint_32 height, SkWStream& out) {
     png_structp png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
@@ skipping 197 matching lines @@
     SkAutoTUnref<SkSurface> surface(this->createCPUSurface());
     SkCanvas* canvas = surface->getCanvas();
 
     // TODO this is really slow and we should cache the matrix and clip
     fDebugCanvas->drawTo(canvas, n);
 
     // make some json
     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);
 
     // We don't want the null terminator so strlen is correct
     return SkData::NewWithCopy(json.c_str(), strlen(json.c_str()));
 }