diff options
| author |  Florin Malita <fmalita@chromium.org> | 2018-02-23 11:10:22 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-23 19:15:26 +0000 |
| commit | 1022f743758b71bcc476e602679282a0acd64ff1 (patch) | |
| tree | 3380edf89e0458408d7d0b63227e9116839f9b39 /dm/DMSrcSink.h | |
| parent | 09f818d2c9c0b82ef5417a7f1d0f2a5ea09fc682 (diff) | |
[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>
Diffstat (limited to 'dm/DMSrcSink.h')
| -rw-r--r-- | dm/DMSrcSink.h | 8 |
1 files changed, 4 insertions, 4 deletions
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<skottie::Animation> fAnimation; + Name fName; + SkISize fTileSize = SkISize::MakeEmpty(); + sk_sp<skottie::Animation> fAnimation; }; #endif |