diff options
Diffstat (limited to 'tools/viewer')
| -rw-r--r-- | tools/viewer/SkottieSlide.cpp | 6 | ||||
| -rw-r--r-- | tools/viewer/SkottieSlide.h | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/viewer/SkottieSlide.cpp b/tools/viewer/SkottieSlide.cpp index aef28e1efc..77501d8a9f 100644 --- a/tools/viewer/SkottieSlide.cpp +++ b/tools/viewer/SkottieSlide.cpp @@ -17,9 +17,9 @@ SkottieSlide::SkottieSlide(const SkString& name, const SkString& path) } void SkottieSlide::load(SkScalar w, SkScalar h) { - fAnimation = skottie::Animation::MakeFromFile(fPath.c_str()); - fWinSize = SkSize::Make(w, h); - fTimeBase = 0; // force a time reset + fAnimation = skottie::Animation::MakeFromFile(fPath.c_str()); + fWinSize = SkSize::Make(w, h); + fTimeBase = 0; // force a time reset if (fAnimation) { fAnimation->setShowInval(fShowAnimationInval); 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; }; |