commit 50a8dd0a00538840e55233146cb202e256cc6c34
author ethannicholas <ethannicholas@google.com> Wed Feb 10 05:40:46 2016 -0800
committer Commit bot <commit-bot@chromium.org> Wed Feb 10 05:40:46 2016 -0800
tree 438fe35251e3e22c94b593ce6fd69917e7b1b8f0
parent d116561ddcca3f961b30cd9e485d81b654bc10ec

Moved Canvas->JSON and JSON->Canvas functionality into SkDebugCanvas.
SkJSONCanvas and SkJSONRenderer will be deleted once the debug server
has been updated.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1681643002

Committed: https://skia.googlesource.com/skia/+/32fff1ba0c759d97ab78320b7ae46dd7696a4e6e

Committed: https://skia.googlesource.com/skia/+/46cb6d6b82b0ab71033aef91419e8beae25bb8a4

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

gyp/SampleApp.gyp

diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index bb48aff..c22eaa2 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -157,6 +157,7 @@
         'views.gyp:views',
         'views_animated.gyp:views_animated',
         'xml.gyp:xml',
+        'jsoncpp.gyp:jsoncpp',
       ],
       'msvs_settings': {
         'VCLinkerTool': {

gyp/debugger.gyp

diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp
index e7e8275..c86538d 100644
--- a/gyp/debugger.gyp
+++ b/gyp/debugger.gyp
@@ -136,6 +136,7 @@
       'dependencies': [
         'debugger_qt_mocs',
         'skia_lib.gyp:skia_lib',
+        'jsoncpp.gyp:jsoncpp',
       ],
       'cflags': [
         # Clang gets confused by QWeakPointer, see http://llvm.org/bugs/show_bug.cgi?id=13127