commit 1022f743758b71bcc476e602679282a0acd64ff1
author Florin Malita <fmalita@chromium.org> Fri Feb 23 11:10:22 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 23 19:15:26 2018 +0000
tree 3380edf89e0458408d7d0b63227e9116839f9b39
parent 09f818d2c9c0b82ef5417a7f1d0f2a5ea09fc682

[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>

dm/DMSrcSink.h

diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index 157a484..1ad2eca 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -274,11 +274,11 @@
 
 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<skottie::Animation> fAnimation;
+    Name                      fName;
+    SkISize                   fTileSize = SkISize::MakeEmpty();
+    sk_sp<skottie::Animation> fAnimation;
 };
 #endif