content/browser/web_contents/web_contents_impl.cc - Issue 1412923009: Route touch-events for WebViewGuest directly to guest renderer.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1412923009: Route touch-events for WebViewGuest directly to guest renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix null pointer deref when guest is terminated. Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/renderer_host/render_widget_host_view_aura.cc ('K') | « content/browser/renderer_host/render_widget_host_view_base.h ('k') | content/public/test/browser_test_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index 05229a81c6dec759070bb41251bedcc46a1b6073..05f977bab82e699fa04f6ca97c22841ef0df5997 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -1597,9 +1597,10 @@ bool WebContentsImpl::PreHandleGestureEvent(

}

RenderWidgetHostInputEventRouter* WebContentsImpl::GetInputEventRouter() {

- // Currently only supported in site per process mode (--site-per-process).

- if (!rwh_input_event_router_.get() && !is_being_destroyed_ &&

- SiteIsolationPolicy::AreCrossProcessFramesPossible())

+ if (!is_being_destroyed_ && GetOuterWebContents())

+ return GetOuterWebContents()->GetInputEventRouter();

+ if (!rwh_input_event_router_.get() && !is_being_destroyed_)

rwh_input_event_router_.reset(new RenderWidgetHostInputEventRouter);

return rwh_input_event_router_.get();

}