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/src/SkottieAnimator.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/skottie/src/SkottieAnimator.h') 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 -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 -bool BindProperty(const json::ValueRef&, +bool BindProperty(const skjson::Value&, sksg::AnimatorList*, std::function&&, const T* noop = nullptr); -- cgit v1.2.3