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

diff --git a/gyp/skiaserve.gyp b/gyp/skiaserve.gyp
index 1b46d225281339d6d1ddb24d0a95fd9936e45604..2cd13b580684166b5b40aaf15390fa2036c46d89 100644 (file)
--- a/gyp/skiaserve.gyp
+++ b/gyp/skiaserve.gyp
@@ -34,7 +34,6 @@
       'dependencies': [
         'flags.gyp:flags',
         'gputest.gyp:skgputest',
-        'json.gyp:json',
         'jsoncpp.gyp:jsoncpp',
         'libpng.gyp:libpng',
         'microhttpd.gyp:microhttpd',

diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp
index 1af299831f22d6f6e0790b68568b077fb59404e4..34cbee7ff5ed5ff78728a0d22e93b3c9327422cb 100644 (file)
--- a/tools/debugger/SkDrawCommand.cpp
+++ b/tools/debugger/SkDrawCommand.cpp
@@ -456,7 +456,7 @@ static Json::Value make_json_rect(const SkRect& rect) {
     return result;
 }
 
-static Json::Value make_json_irect(const SkIRect& rect) {
+Json::Value SkDrawCommand::MakeJsonIRect(const SkIRect& rect) {
     Json::Value result(Json::arrayValue);
     result.append(Json::Value(rect.left()));
     result.append(Json::Value(rect.top()));
@@ -475,7 +475,7 @@ static Json::Value make_json_rrect(const SkRRect& rrect) {
     return result;
 }
 
-static Json::Value make_json_matrix(const SkMatrix& matrix) {
+Json::Value SkDrawCommand::MakeJsonMatrix(const SkMatrix& matrix) {
     Json::Value result(Json::arrayValue);
     Json::Value row1(Json::arrayValue);
     row1.append(Json::Value(matrix[0]));
@@ -1707,7 +1707,7 @@ void SkConcatCommand::execute(SkCanvas* canvas) const {
 
 Json::Value SkConcatCommand::toJSON(UrlDataManager& urlDataManager) const {
     Json::Value result = INHERITED::toJSON(urlDataManager);
-    result[SKDEBUGCANVAS_ATTRIBUTE_MATRIX] = make_json_matrix(fMatrix);
+    result[SKDEBUGCANVAS_ATTRIBUTE_MATRIX] = MakeJsonMatrix(fMatrix);
     return result;
 }
 
@@ -1819,7 +1819,7 @@ Json::Value SkDrawBitmapNineCommand::toJSON(UrlDataManager& urlDataManager) cons
     Json::Value encoded;
     if (flatten(fBitmap, &encoded, urlDataManager)) {
         result[SKDEBUGCANVAS_ATTRIBUTE_BITMAP] = encoded;
-        result[SKDEBUGCANVAS_ATTRIBUTE_CENTER] = make_json_irect(fCenter);
+        result[SKDEBUGCANVAS_ATTRIBUTE_CENTER] = MakeJsonIRect(fCenter);
         result[SKDEBUGCANVAS_ATTRIBUTE_DST] = make_json_rect(fDst);
         if (fPaintPtr != nullptr) {
             result[SKDEBUGCANVAS_ATTRIBUTE_PAINT] = make_json_paint(*fPaintPtr, urlDataManager);
@@ -2883,7 +2883,7 @@ Json::Value SkDrawTextOnPathCommand::toJSON(UrlDataManager& urlDataManager) cons
     Json::Value coords(Json::arrayValue);
     result[SKDEBUGCANVAS_ATTRIBUTE_PATH] = make_json_path(fPath);
     if (!fMatrix.isIdentity()) {
-        result[SKDEBUGCANVAS_ATTRIBUTE_MATRIX] = make_json_matrix(fMatrix);
+        result[SKDEBUGCANVAS_ATTRIBUTE_MATRIX] = MakeJsonMatrix(fMatrix);
     }
     result[SKDEBUGCANVAS_ATTRIBUTE_PAINT] = make_json_paint(fPaint, urlDataManager);
     return result;
@@ -3105,7 +3105,7 @@ void SkSetMatrixCommand::execute(SkCanvas* canvas) const {
 
 Json::Value SkSetMatrixCommand::toJSON(UrlDataManager& urlDataManager) const {
     Json::Value result = INHERITED::toJSON(urlDataManager);
-    result[SKDEBUGCANVAS_ATTRIBUTE_MATRIX] = make_json_matrix(fMatrix);
+    result[SKDEBUGCANVAS_ATTRIBUTE_MATRIX] = MakeJsonMatrix(fMatrix);
     return result;
 }
 

diff --git a/tools/debugger/SkDrawCommand.h b/tools/debugger/SkDrawCommand.h
index 74c2b2c69eff2442d0c23baef17a805432ba3b65..a2835dc6e7250d6aedbe425925c1565c823deafe 100644 (file)
--- a/tools/debugger/SkDrawCommand.h
+++ b/tools/debugger/SkDrawCommand.h
@@ -113,6 +113,10 @@ public:
 
     static const char* GetCommandString(OpType type);
 
+    // Helper methods for converting things to JSON
+    static Json::Value MakeJsonIRect(const SkIRect&);
+    static Json::Value MakeJsonMatrix(const SkMatrix&);
+
 protected:
     SkTDArray<SkString*> fInfo;
 

diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp
index 8ffcc36f77781a685d0303913faf5d1ce081f5e6..46e3039aad95acfddf651f13d1eb701d1769adfd 100644 (file)
--- 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 @@ SkData* Request::getJsonInfo(int n) {
     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);