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

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 1405293002: OOPIF: Route keyboard events to focused frame in the browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@focus-page
Patch Set: Add edit stack bug reference. Created 5 years, 2 months 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/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index 3ced095e950303c4870ec6f7325b6a381874fcef..674f87a483c1adaecb2bb8117a36efef10a53a5e 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -1677,8 +1677,21 @@ void RenderWidgetHostViewAndroid::UnlockMouse() {
void RenderWidgetHostViewAndroid::SendKeyEvent(
const NativeWebKeyboardEvent& event) {
- if (host_)
- host_->ForwardKeyboardEvent(event);
+ if (!host_)
+ return;
+
+ RenderWidgetHostImpl* target_host = host_;
+
+ // If there are multiple widgets on the page (such as when there are
+ // out-of-process iframes), pick the one that should process this event.
+ if (host_->delegate()) {
+ RenderWidgetHostImpl* focused_host =
+ host_->delegate()->GetFocusedRenderWidgetHost();
+ if (focused_host)
+ target_host = focused_host;
+ }
+
+ target_host->ForwardKeyboardEvent(event);
}
void RenderWidgetHostViewAndroid::SendMouseEvent(

Powered by Google App Engine
This is Rietveld 408576698