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 e01a4d5484380c82981615cd9ccd33e2f8c18092..58e6396e00b078ef443fcf3fce944adc93a03367 100644 |
| --- a/content/browser/web_contents/web_contents_impl.cc |
| +++ b/content/browser/web_contents/web_contents_impl.cc |
| @@ -1593,9 +1593,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(); |
|
kenrb
2015/11/05 17:05:26
If we create an input event router before being at
wjmaclean
2015/11/05 17:46:16
Yes, at present we do leave these around. I though
|
| + |
| + if (!rwh_input_event_router_.get() && !is_being_destroyed_) |
| rwh_input_event_router_.reset(new RenderWidgetHostInputEventRouter); |
| return rwh_input_event_router_.get(); |
| } |