[skottie] Nested animation support

Extend composition layers to support referencing external .json
animations ("$"<PATH> 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 <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>

1 files changed, 5 insertions, 5 deletions

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<skottie::Animation> fAnimation;
-    SkSize                              fWinSize = SkSize::MakeEmpty();
-    SkMSec                              fTimeBase  = 0;
-    bool                                fShowAnimationInval = false;
+    SkString                  fPath;
+    sk_sp<skottie::Animation> fAnimation;
+    SkSize                    fWinSize = SkSize::MakeEmpty();
+    SkMSec                    fTimeBase  = 0;
+    bool                      fShowAnimationInval = false;
 
     typedef Slide INHERITED;
 };