diff options
author | Florin Malita <fmalita@chromium.org> | 2018-06-14 16:16:01 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-14 21:21:14 +0000 |
commit | 7d42c44cddee7b7a12fa7c59099e989995eabf3a (patch) | |
tree | 6e0d460c0a8fc7366ed76cc8f89f5c532d9d2678 /modules/skottie/include/Skottie.h | |
parent | 725d5ad257898c23ef27f4d7feaa545103932c03 (diff) |
[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 <mtklein@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'modules/skottie/include/Skottie.h')
-rw-r--r-- | modules/skottie/include/Skottie.h | 5 |
1 files changed, 2 insertions, 3 deletions
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; |