Commit 400746df authored by Alex Newcomer's avatar Alex Newcomer Committed by Commit Bot

cros: Fix crash after menu closes

After the menu closes, rendered content can be delivered
using a null |deliver_image_model_callback_|, so check for it
before calling.

Bug: 1134418
Change-Id: Ic97f3871a201a1c289835df74b891edf9d616460
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2491141Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Alex Newcomer <newcomer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821297}
parent f50cb6e5
......@@ -180,6 +180,11 @@ void ClipboardImageModelRequest::CopySurface() {
}
void ClipboardImageModelRequest::OnCopyComplete(const SkBitmap& bitmap) {
if (!deliver_image_model_callback_) {
Stop();
return;
}
std::move(deliver_image_model_callback_)
.Run(ui::ImageModel::FromImageSkia(
gfx::ImageSkia::CreateFrom1xBitmap(bitmap)));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment