AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[skottie-wasm] Add support for nested animation playback

Browse Source 
Plumb the newly added [1] ExternalAnimationPrecompInterceptor.

[1] https://skia-review.googlesource.com/c/skia/+/288130

Change-Id: I8e000692fdae8dd006405db98b6814e047f77276
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/288356
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
This commit is contained in:
Florin Malita 2020-05-06 22:20:14 -04:00 committed by Skia Commit-Bot
parent e3d1de7c52
commit 2871ab0727
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/canvaskit/skottie_bindings.cpp
View File

@ -64,6 +64,11 @@ public:
return this->findAsset(name);
}
sk_sp<SkData> load(const char[]/*path*/, const char name[]) const override {
// Ignore paths.
return this->findAsset(name);
}
private:
explicit SkottieAssetProvider(AssetVec assets) : fAssets(std::move(assets)) {}
@ -86,10 +91,14 @@ public:
static sk_sp<ManagedAnimation> Make(const std::string& json,
sk_sp<skottie::ResourceProvider> rp) {
auto mgr = std::make_unique<skottie_utils::CustomPropertyManager>();
static constexpr char kInterceptPrefix[] = "__";
auto pinterceptor =
sk_make_sp<skottie_utils::ExternalAnimationPrecompInterceptor>(rp, kInterceptPrefix);
auto animation = skottie::Animation::Builder()
.setMarkerObserver(mgr->getMarkerObserver())
.setPropertyObserver(mgr->getPropertyObserver())
.setResourceProvider(rp)
.setResourceProvider(std::move(rp))
.setPrecompInterceptor(std::move(pinterceptor))
.make(json.c_str(), json.size());
return animation