diff options
| author | Florin Malita <fmalita@chromium.org> | 2018-08-22 20:37:04 -0400 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-08-23 13:13:30 +0000 |
| commit | 40c37426b3ec16164dc73b4a6cead1ffb44984ad (patch) | |
| tree | 8c05c06390a661205de5e6a490c5365053e2c15c /platform_tools | |
| parent | 482238712379c9f4577844ff460fd8007eb268a4 (diff) | |
| download | skqp-40c37426b3ec16164dc73b4a6cead1ffb44984ad.tar.gz | |
[skottie] Plumb external SkFontMgr
Allow embedders to pass a font manager.
In order to avoid excessive factory API clutter, introduce an
Animation::Builder helper to wrap factory options.
Also clean up various bits:
* hoist scene parsing out of the Animation ctor
* store the animation duration explicitly (instead of unused fps)
* plumb const SkFontMgr& internally (instead of a ref)
Change-Id: I3e180dfa85ba18c8462cfeb5a7385bef985ed6c4
Reviewed-on: https://skia-review.googlesource.com/148800
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/apps/skottie/src/main/cpp/native-lib.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/platform_tools/android/apps/skottie/src/main/cpp/native-lib.cpp b/platform_tools/android/apps/skottie/src/main/cpp/native-lib.cpp index 3cbedbcb3f..d4b4a74544 100644 --- a/platform_tools/android/apps/skottie/src/main/cpp/native-lib.cpp +++ b/platform_tools/android/apps/skottie/src/main/cpp/native-lib.cpp @@ -123,8 +123,7 @@ Java_org_skia_skottie_SkottieRunner_00024SkottieAnimation_nCreateProxy(JNIEnv *e skottieAnimation->mRunner = skottieRunner; skottieAnimation->mStream = std::move(stream); - skottieAnimation->mAnimation = skottie::Animation::Make(skottieAnimation->mStream.get(), - nullptr, nullptr); + skottieAnimation->mAnimation = skottie::Animation::Make(skottieAnimation->mStream.get()); skottieAnimation->mTimeBase = 0.0f; // force a time reset skottieAnimation->mDuration = 1000 * skottieAnimation->mAnimation->duration(); |