Chromium Code Reviews| 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 c36e3a7772a42c2db4136b046e7e05f35b378305..3aa072282b7f9770d2e8447b22a22f474d220c92 100644 |
| --- a/content/browser/web_contents/web_contents_impl.cc |
| +++ b/content/browser/web_contents/web_contents_impl.cc |
| @@ -1604,9 +1604,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); |
|
Charlie Reis
2015/11/30 18:09:12
Before this CL, we never created this in default C
wjmaclean
2015/12/10 16:09:07
This CL is targeted to (in the short term) fixing
Charlie Reis
2015/12/10 21:58:14
This doesn't sound safe to me.
If I read this cor
|
| return rwh_input_event_router_.get(); |
| } |