aboutsummaryrefslogtreecommitdiffhomepage
path: root/experimental/skottie/Skottie.h
diff options
context:
space:
mode:
Diffstat (limited to 'experimental/skottie/Skottie.h')
-rw-r--r--experimental/skottie/Skottie.h21
1 files changed, 8 insertions, 13 deletions
diff --git a/experimental/skottie/Skottie.h b/experimental/skottie/Skottie.h
index e13bd0ae98..d2486dc946 100644
--- a/experimental/skottie/Skottie.h
+++ b/experimental/skottie/Skottie.h
@@ -23,12 +23,10 @@ class SkStream;
namespace Json { class Value; }
-namespace sksg { class RenderNode; }
+namespace sksg { class Scene; }
namespace skottie {
-class AnimatorBase;
-
class ResourceProvider : public SkNoncopyable {
public:
virtual ~ResourceProvider() = default;
@@ -54,23 +52,20 @@ public:
SkScalar inPoint() const { return fInPoint; }
SkScalar outPoint() const { return fOutPoint; }
- void setShowInval(bool show) { fShowInval = show; }
+ void setShowInval(bool show);
private:
Animation(const ResourceProvider&,
SkString ver, const SkSize& size, SkScalar fps,
const Json::Value&);
- SkString fVersion;
- SkSize fSize;
- SkScalar fFrameRate,
- fInPoint,
- fOutPoint;
-
- sk_sp<sksg::RenderNode> fDom;
- SkTArray<std::unique_ptr<AnimatorBase>> fAnimators;
+ SkString fVersion;
+ SkSize fSize;
+ SkScalar fFrameRate,
+ fInPoint,
+ fOutPoint;
- bool fShowInval = false;
+ std::unique_ptr<sksg::Scene> fScene;
typedef SkNoncopyable INHERITED;
};