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 --- tools/viewer/SkottieSlide.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/viewer/SkottieSlide.h') diff --git a/tools/viewer/SkottieSlide.h b/tools/viewer/SkottieSlide.h index ac26d2f3c1..b5770a0cf8 100644 --- a/tools/viewer/SkottieSlide.h +++ b/tools/viewer/SkottieSlide.h @@ -30,11 +30,11 @@ public: bool onMouse(SkScalar x, SkScalar y, sk_app::Window::InputState, uint32_t modifiers) override; private: - SkString fPath; - std::unique_ptr fAnimation; - SkSize fWinSize = SkSize::MakeEmpty(); - SkMSec fTimeBase = 0; - bool fShowAnimationInval = false; + SkString fPath; + sk_sp fAnimation; + SkSize fWinSize = SkSize::MakeEmpty(); + SkMSec fTimeBase = 0; + bool fShowAnimationInval = false; typedef Slide INHERITED; }; -- cgit v1.2.3