From 7d42c44cddee7b7a12fa7c59099e989995eabf3a Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Thu, 14 Jun 2018 16:16:01 -0400 Subject: [skottie] Switch to SkJSON Convert to SkJSON APIs and remove RapidJSON dependency. TBR= Change-Id: I5b4fd78821a443326e3a5b370748d840b80ef279 Reviewed-on: https://skia-review.googlesource.com/134612 Reviewed-by: Mike Klein Commit-Queue: Florin Malita --- modules/skottie/include/Skottie.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'modules/skottie/include/Skottie.h') diff --git a/modules/skottie/include/Skottie.h b/modules/skottie/include/Skottie.h index a1993832f6..54f293c849 100644 --- a/modules/skottie/include/Skottie.h +++ b/modules/skottie/include/Skottie.h @@ -19,12 +19,11 @@ class SkCanvas; struct SkRect; class SkStream; +namespace skjson { class ObjectValue; } namespace sksg { class Scene; } namespace skottie { -namespace json { class ValueRef; } - class SK_API ResourceProvider : public SkNoncopyable { public: virtual ~ResourceProvider() = default; @@ -78,7 +77,7 @@ public: private: Animation(const ResourceProvider&, SkString ver, const SkSize& size, SkScalar fps, - const json::ValueRef&, Stats*); + const skjson::ObjectValue&, Stats*); SkString fVersion; SkSize fSize; -- cgit v1.2.3