OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/frame_host/cross_process_frame_connector.h" | 5 #include "content/browser/frame_host/cross_process_frame_connector.h" |
6 | 6 |
| 7 #include "content/browser/frame_host/frame_tree_node.h" |
| 8 #include "content/browser/frame_host/render_frame_host_manager.h" |
7 #include "content/browser/frame_host/render_frame_proxy_host.h" | 9 #include "content/browser/frame_host/render_frame_proxy_host.h" |
8 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" | 10 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
9 #include "content/browser/renderer_host/render_view_host_impl.h" | 11 #include "content/browser/renderer_host/render_view_host_impl.h" |
10 #include "content/browser/renderer_host/render_widget_host_impl.h" | 12 #include "content/browser/renderer_host/render_widget_host_impl.h" |
11 #include "content/common/frame_messages.h" | 13 #include "content/common/frame_messages.h" |
12 #include "content/common/gpu/gpu_messages.h" | 14 #include "content/common/gpu/gpu_messages.h" |
13 #include "third_party/WebKit/public/web/WebInputEvent.h" | 15 #include "third_party/WebKit/public/web/WebInputEvent.h" |
14 | 16 |
15 namespace content { | 17 namespace content { |
16 | 18 |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 return child_frame_rect_; | 109 return child_frame_rect_; |
108 } | 110 } |
109 | 111 |
110 void CrossProcessFrameConnector::OnForwardInputEvent( | 112 void CrossProcessFrameConnector::OnForwardInputEvent( |
111 const blink::WebInputEvent* event) { | 113 const blink::WebInputEvent* event) { |
112 if (!view_) | 114 if (!view_) |
113 return; | 115 return; |
114 | 116 |
115 RenderWidgetHostImpl* child_widget = | 117 RenderWidgetHostImpl* child_widget = |
116 RenderWidgetHostImpl::From(view_->GetRenderWidgetHost()); | 118 RenderWidgetHostImpl::From(view_->GetRenderWidgetHost()); |
| 119 RenderFrameHostManager* manager = |
| 120 frame_proxy_in_parent_renderer_->frame_tree_node()->render_manager(); |
117 RenderWidgetHostImpl* parent_widget = | 121 RenderWidgetHostImpl* parent_widget = |
118 frame_proxy_in_parent_renderer_->GetRenderViewHost(); | 122 manager->ForInnerDelegate() |
| 123 ? manager->GetOuterRenderViewHostForKeyboardInput() |
| 124 : frame_proxy_in_parent_renderer_->GetRenderViewHost(); |
119 | 125 |
120 if (blink::WebInputEvent::isKeyboardEventType(event->type)) { | 126 if (blink::WebInputEvent::isKeyboardEventType(event->type)) { |
121 if (!parent_widget->GetLastKeyboardEvent()) | 127 if (!parent_widget->GetLastKeyboardEvent()) |
122 return; | 128 return; |
123 NativeWebKeyboardEvent keyboard_event( | 129 NativeWebKeyboardEvent keyboard_event( |
124 *parent_widget->GetLastKeyboardEvent()); | 130 *parent_widget->GetLastKeyboardEvent()); |
125 child_widget->ForwardKeyboardEvent(keyboard_event); | 131 child_widget->ForwardKeyboardEvent(keyboard_event); |
126 return; | 132 return; |
127 } | 133 } |
128 | 134 |
(...skipping 20 matching lines...) Expand all Loading... |
149 } | 155 } |
150 } | 156 } |
151 | 157 |
152 void CrossProcessFrameConnector::SetSize(gfx::Rect frame_rect) { | 158 void CrossProcessFrameConnector::SetSize(gfx::Rect frame_rect) { |
153 child_frame_rect_ = frame_rect; | 159 child_frame_rect_ = frame_rect; |
154 if (view_) | 160 if (view_) |
155 view_->SetSize(frame_rect.size()); | 161 view_->SetSize(frame_rect.size()); |
156 } | 162 } |
157 | 163 |
158 } // namespace content | 164 } // namespace content |
OLD | NEW |