Commit d1687c4e authored by Dave Tapuska's avatar Dave Tapuska Committed by Commit Bot

Do not handle DoSetCursor for deleted plugins.

Fix a crash related to change
https://chromium-review.googlesource.com/c/chromium/src/+/2418998

Seems there is reentrancy during destruction for pepper plugin
instance. Do not access any containers if we've been marked for
deletion. This follows the same convention for handling messages.

BUG=1130991

Change-Id: I2004265dc5592761c24c957be6231c3a1ad86d2f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2423271Reviewed-by: default avatarBill Budge <bbudge@chromium.org>
Reviewed-by: default avatardanakj <danakj@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809429}
parent bf8a1b65
...@@ -3028,6 +3028,9 @@ void PepperPluginInstanceImpl::SetAlwaysOnTop(bool on_top) { ...@@ -3028,6 +3028,9 @@ void PepperPluginInstanceImpl::SetAlwaysOnTop(bool on_top) {
} }
void PepperPluginInstanceImpl::DoSetCursor(std::unique_ptr<ui::Cursor> cursor) { void PepperPluginInstanceImpl::DoSetCursor(std::unique_ptr<ui::Cursor> cursor) {
if (is_deleted_)
return;
cursor_ = std::move(cursor); cursor_ = std::move(cursor);
if (fullscreen_container_) { if (fullscreen_container_) {
fullscreen_container_->PepperDidChangeCursor(*cursor_); fullscreen_container_->PepperDidChangeCursor(*cursor_);
......
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