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/src/SkottieAnimator.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/src/SkottieAnimator.h')
-rw-r--r-- | modules/skottie/src/SkottieAnimator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/skottie/src/SkottieAnimator.h b/modules/skottie/src/SkottieAnimator.h index 6dc8f6c759..c4464e3138 100644 --- a/modules/skottie/src/SkottieAnimator.h +++ b/modules/skottie/src/SkottieAnimator.h @@ -12,14 +12,14 @@ #include <functional> -namespace skottie { +namespace skjson { class Value; } -namespace json { class ValueRef; } +namespace skottie { // This is the workhorse for property binding: depending on whether the property is animated, // it will either apply immediately or instantiate and attach a keyframe animator. template <typename T> -bool BindProperty(const json::ValueRef&, +bool BindProperty(const skjson::Value&, sksg::AnimatorList*, std::function<void(const T&)>&&, const T* noop = nullptr); |