Commit 5f7b338c authored by Mustaq Ahmed's avatar Mustaq Ahmed Committed by Commit Bot

Fix a null pointer exception with nuked view while 2+ gestures in queue.

Bug: 1113758
Change-Id: I955a8031913e6acf1fe3c5b878e819a2d4a38fcf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2350560
Commit-Queue: Mustaq Ahmed <mustaq@chromium.org>
Reviewed-by: default avatarSadrul Chowdhury <sadrul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797455}
parent 86b81b68
...@@ -514,6 +514,8 @@ RenderWidgetHostImpl* RenderWidgetHostImpl::From(RenderWidgetHost* rwh) { ...@@ -514,6 +514,8 @@ RenderWidgetHostImpl* RenderWidgetHostImpl::From(RenderWidgetHost* rwh) {
} }
void RenderWidgetHostImpl::SetView(RenderWidgetHostViewBase* view) { void RenderWidgetHostImpl::SetView(RenderWidgetHostViewBase* view) {
synthetic_gesture_controller_.reset();
if (view) { if (view) {
view_ = view->GetWeakPtr(); view_ = view->GetWeakPtr();
if (!create_frame_sink_callback_.is_null()) if (!create_frame_sink_callback_.is_null())
...@@ -521,8 +523,6 @@ void RenderWidgetHostImpl::SetView(RenderWidgetHostViewBase* view) { ...@@ -521,8 +523,6 @@ void RenderWidgetHostImpl::SetView(RenderWidgetHostViewBase* view) {
} else { } else {
view_.reset(); view_.reset();
} }
synthetic_gesture_controller_.reset();
} }
// static // static
......
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