From 1022f743758b71bcc476e602679282a0acd64ff1 Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Fri, 23 Feb 2018 11:10:22 -0500 Subject: [skottie] Nested animation support Extend composition layers to support referencing external .json animations ("$" syntax). This is a custom extension (not supported in BM/Lottie). Also make skottie::Animation ref-counted, to facilitate sharing. TBR= Change-Id: I062d031e5868d759f3930dea9b261f9b3ec81684 Reviewed-on: https://skia-review.googlesource.com/109806 Reviewed-by: Florin Malita Commit-Queue: Florin Malita --- dm/DMSrcSink.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dm/DMSrcSink.h') diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index 157a484d2b..1ad2eca79f 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -274,11 +274,11 @@ public: private: // Generates a kTileCount x kTileCount filmstrip with evenly distributed frames. - static constexpr int kTileCount = 5; + static constexpr int kTileCount = 5; - Name fName; - SkISize fTileSize = SkISize::MakeEmpty(); - std::unique_ptr fAnimation; + Name fName; + SkISize fTileSize = SkISize::MakeEmpty(); + sk_sp fAnimation; }; #endif -- cgit v1.2.3