Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

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: Update comments (saving first this time). Created 5 years 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
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 3ff2c4d37f4922fe102f61eef166b21f8472a8ce..4755716effca5085531146e6c63cf52996454939 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1595,9 +1595,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();
}
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.mm ('k') | content/public/test/browser_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698