commit 06c9e2962b4d67d546eb87deafca5541b33aeb64
author Brian Salomon <bsalomon@google.com> Thu Apr 29 14:10:23 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Apr 29 19:40:08 2021 +0000
tree 32a0f9115b674f5bbc99eb75d2c82e09e6ad6321
parent 5cddd7f5e16cec1e9a249630a83b735158f80982

Revert "Revert "Add mskp player, use in viewer slide""

This reverts commit 0d174586c46923098eca1684e21a7049d5b62116.

Use SkTLazy instead of std::optional (C++17 library feature)

Bug: skia:11900
Change-Id: Ia41caa9322d812f9ba6644dd14ede7d0015cf8b3
Cq-Include-Trybots: luci.skia.skia.primary:Housekeeper-PerCommit-CreateDockerImage_Skia_Release,Build-Debian10-Clang-x86_64-Release-CMake
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402642
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/utils/SkMultiPictureDocument.cpp

diff --git a/src/utils/SkMultiPictureDocument.cpp b/src/utils/SkMultiPictureDocument.cpp
index 471a2b3..c9a15fd 100644
--- a/src/utils/SkMultiPictureDocument.cpp
+++ b/src/utils/SkMultiPictureDocument.cpp
@@ -199,6 +199,9 @@
     }
 
     auto picture = SkPicture::MakeFromStream(stream, procs);
+    if (!picture) {
+        return false;
+    }
 
     PagerCanvas canvas(joined.toCeil(), dstArray, dstArrayCount);
     // Must call playback(), not drawPicture() to reach