[skottie] Fix viewer slide sizing on Android

TBR=

Change-Id: Ibbf4d22ba01e39b80c1f76d9af6bef647454996f
Reviewed-on: https://skia-review.googlesource.com/106160
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>

2 files changed, 6 insertions, 3 deletions

diff --git a/tools/viewer/SkottieSlide.cpp b/tools/viewer/SkottieSlide.cpp
index 8880916a16..063330e925 100644
--- a/tools/viewer/SkottieSlide.cpp
+++ b/tools/viewer/SkottieSlide.cpp
@@ -16,8 +16,9 @@ SkottieSlide::SkottieSlide(const SkString& name, const SkString& path)
     fName = name;
 }
 
-void SkottieSlide::load(SkScalar, SkScalar) {
+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
 
     if (fAnimation) {
@@ -37,13 +38,14 @@ void SkottieSlide::unload() {
 }
 
 SkISize SkottieSlide::getDimensions() const {
-    return fAnimation? fAnimation->size().toCeil() : SkISize::Make(0, 0);
+    // We always scale to fill the window.
+    return fWinSize.toCeil();
 }
 
 void SkottieSlide::draw(SkCanvas* canvas) {
     if (fAnimation) {
         SkAutoCanvasRestore acr(canvas, true);
-        const SkRect dstR = SkRect::Make(canvas->imageInfo().bounds());
+        const auto dstR = SkRect::MakeSize(fWinSize);
         fAnimation->render(canvas, &dstR);
     }
 }
diff --git a/tools/viewer/SkottieSlide.h b/tools/viewer/SkottieSlide.h
index cbb70b2183..ffa3bba7e2 100644
--- a/tools/viewer/SkottieSlide.h
+++ b/tools/viewer/SkottieSlide.h
@@ -31,6 +31,7 @@ public:
 private:
     SkString                            fPath;
     std::unique_ptr<skottie::Animation> fAnimation;
+    SkSize                              fWinSize = SkSize::MakeEmpty();
     SkMSec                              fTimeBase  = 0;
     bool                                fShowAnimationInval = false;