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 "cc/surfaces/surface.h" | 7 #include "cc/surfaces/surface.h" |
8 #include "cc/surfaces/surface_manager.h" | 8 #include "cc/surfaces/surface_manager.h" |
| 9 #include "content/browser/frame_host/frame_tree_node.h" |
| 10 #include "content/browser/frame_host/render_frame_host_manager.h" |
9 #include "content/browser/frame_host/render_frame_proxy_host.h" | 11 #include "content/browser/frame_host/render_frame_proxy_host.h" |
10 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" | 12 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
11 #include "content/browser/renderer_host/render_view_host_impl.h" | 13 #include "content/browser/renderer_host/render_view_host_impl.h" |
12 #include "content/browser/renderer_host/render_widget_host_impl.h" | 14 #include "content/browser/renderer_host/render_widget_host_impl.h" |
13 #include "content/common/frame_messages.h" | 15 #include "content/common/frame_messages.h" |
14 #include "content/common/gpu/gpu_messages.h" | 16 #include "content/common/gpu/gpu_messages.h" |
15 #include "third_party/WebKit/public/web/WebInputEvent.h" | 17 #include "third_party/WebKit/public/web/WebInputEvent.h" |
16 | 18 |
17 namespace content { | 19 namespace content { |
18 | 20 |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 return child_frame_rect_; | 149 return child_frame_rect_; |
148 } | 150 } |
149 | 151 |
150 void CrossProcessFrameConnector::OnForwardInputEvent( | 152 void CrossProcessFrameConnector::OnForwardInputEvent( |
151 const blink::WebInputEvent* event) { | 153 const blink::WebInputEvent* event) { |
152 if (!view_) | 154 if (!view_) |
153 return; | 155 return; |
154 | 156 |
155 RenderWidgetHostImpl* child_widget = | 157 RenderWidgetHostImpl* child_widget = |
156 RenderWidgetHostImpl::From(view_->GetRenderWidgetHost()); | 158 RenderWidgetHostImpl::From(view_->GetRenderWidgetHost()); |
| 159 RenderFrameHostManager* manager = |
| 160 frame_proxy_in_parent_renderer_->frame_tree_node()->render_manager(); |
157 RenderWidgetHostImpl* parent_widget = | 161 RenderWidgetHostImpl* parent_widget = |
158 frame_proxy_in_parent_renderer_->GetRenderViewHost(); | 162 manager->ForInnerDelegate() |
| 163 ? manager->GetOuterRenderWidgetHostForKeyboardInput() |
| 164 : frame_proxy_in_parent_renderer_->GetRenderViewHost(); |
159 | 165 |
160 if (blink::WebInputEvent::isKeyboardEventType(event->type)) { | 166 if (blink::WebInputEvent::isKeyboardEventType(event->type)) { |
161 if (!parent_widget->GetLastKeyboardEvent()) | 167 if (!parent_widget->GetLastKeyboardEvent()) |
162 return; | 168 return; |
163 NativeWebKeyboardEvent keyboard_event( | 169 NativeWebKeyboardEvent keyboard_event( |
164 *parent_widget->GetLastKeyboardEvent()); | 170 *parent_widget->GetLastKeyboardEvent()); |
165 child_widget->ForwardKeyboardEvent(keyboard_event); | 171 child_widget->ForwardKeyboardEvent(keyboard_event); |
166 return; | 172 return; |
167 } | 173 } |
168 | 174 |
(...skipping 20 matching lines...) Expand all Loading... |
189 } | 195 } |
190 } | 196 } |
191 | 197 |
192 void CrossProcessFrameConnector::SetSize(gfx::Rect frame_rect) { | 198 void CrossProcessFrameConnector::SetSize(gfx::Rect frame_rect) { |
193 child_frame_rect_ = frame_rect; | 199 child_frame_rect_ = frame_rect; |
194 if (view_) | 200 if (view_) |
195 view_->SetSize(frame_rect.size()); | 201 view_->SetSize(frame_rect.size()); |
196 } | 202 } |
197 | 203 |
198 } // namespace content | 204 } // namespace content |
OLD | NEW |