[skottie] Hierarchical animators

Instead of a flat animator space, introduce animator groups.

This allows us to encapsulate layer animators and only dispatch ticks
when their owning layer is active.

TBR=

Change-Id: I1fc8a55abf68a712b71969bb1a11275dbe54c236
Reviewed-on: https://skia-review.googlesource.com/101201
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/experimental/skottie/SkottieAnimator.cpp b/experimental/skottie/SkottieAnimator.cpp
index b50e8ac442..c5cea588eb 100644
--- a/experimental/skottie/SkottieAnimator.cpp
+++ b/experimental/skottie/SkottieAnimator.cpp
@@ -275,7 +275,7 @@ private:
 
 template <typename T>
 static inline bool BindPropertyImpl(const Json::Value& jprop,
-                                    sksg::Scene::AnimatorList* animators,
+                                    sksg::AnimatorList* animators,
                                     std::function<void(const T&)>&& apply,
                                     const T* noop) {
     if (!jprop.isObject())
@@ -318,7 +318,7 @@ static inline bool BindPropertyImpl(const Json::Value& jprop,
 
 template <>
 bool BindProperty(const Json::Value& jprop,
-                  sksg::Scene::AnimatorList* animators,
+                  sksg::AnimatorList* animators,
                   std::function<void(const ScalarValue&)>&& apply,
                   const ScalarValue* noop) {
     return BindPropertyImpl(jprop, animators, std::move(apply), noop);
@@ -326,7 +326,7 @@ bool BindProperty(const Json::Value& jprop,
 
 template <>
 bool BindProperty(const Json::Value& jprop,
-                  sksg::Scene::AnimatorList* animators,
+                  sksg::AnimatorList* animators,
                   std::function<void(const VectorValue&)>&& apply,
                   const VectorValue* noop) {
     return BindPropertyImpl(jprop, animators, std::move(apply), noop);
@@ -334,7 +334,7 @@ bool BindProperty(const Json::Value& jprop,
 
 template <>
 bool BindProperty(const Json::Value& jprop,
-                  sksg::Scene::AnimatorList* animators,
+                  sksg::AnimatorList* animators,
                   std::function<void(const ShapeValue&)>&& apply,
                   const ShapeValue* noop) {
     return BindPropertyImpl(jprop, animators, std::move(apply), noop);