Commit 459031f7 authored by Ken Rockot's avatar Ken Rockot Committed by Commit Bot

[views] Fix NativeViewHost crash

NativeViewHost does not safely handle the case where it is added and
then removed from a view hierarchy without ever being added to a
Widget. Instead it crashes. This CL fixes the crash.

Bug: None
Change-Id: Ib25f754386b6512973861c4603c1f1a91a0cdb1a
Reviewed-on: https://chromium-review.googlesource.com/c/1277687
Commit-Queue: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: default avatarSadrul Chowdhury <sadrul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599651}
parent bd22b04d
...@@ -176,7 +176,7 @@ void NativeViewHost::ViewHierarchyChanged( ...@@ -176,7 +176,7 @@ void NativeViewHost::ViewHierarchyChanged(
if (!native_wrapper_.get()) if (!native_wrapper_.get())
native_wrapper_.reset(NativeViewHostWrapper::CreateWrapper(this)); native_wrapper_.reset(NativeViewHostWrapper::CreateWrapper(this));
native_wrapper_->AddedToWidget(); native_wrapper_->AddedToWidget();
} else if (!details.is_add) { } else if (!details.is_add && native_wrapper_) {
native_wrapper_->RemovedFromWidget(); native_wrapper_->RemovedFromWidget();
} }
} }
......
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