Chromium Code Reviews| Index: content/browser/frame_host/cross_process_frame_connector.cc |
| diff --git a/content/browser/frame_host/cross_process_frame_connector.cc b/content/browser/frame_host/cross_process_frame_connector.cc |
| index d945a2ff74be682834bd061810b962212b1d0f5f..2cccdc3510398b7fbf114d4ce1afb17259007cad 100644 |
| --- a/content/browser/frame_host/cross_process_frame_connector.cc |
| +++ b/content/browser/frame_host/cross_process_frame_connector.cc |
| @@ -149,6 +149,13 @@ gfx::Point CrossProcessFrameConnector::TransformPointToRootCoordSpace( |
| return transformed_point; |
| } |
| +void CrossProcessFrameConnector::ForwardProcessAckedTouchEvent( |
| + const TouchEventWithLatencyInfo& touch, |
| + InputEventAckState ack_result) { |
| + if (auto main_view = GetRootRenderWidgetHostView()) |
|
nasko
2016/02/29 22:10:26
nit: Variable declaration should be outside the if
wjmaclean
2016/02/29 23:33:55
Done.
|
| + main_view->ProcessAckedTouchEvent(touch, ack_result); |
| +} |
| + |
| bool CrossProcessFrameConnector::HasFocus() { |
| RenderWidgetHostViewBase* root_view = GetRootRenderWidgetHostView(); |
| if (root_view) |
| @@ -156,6 +163,12 @@ bool CrossProcessFrameConnector::HasFocus() { |
| return false; |
| } |
| +void CrossProcessFrameConnector::Focus() { |
|
nasko
2016/02/29 22:10:26
Should this be named FocusRoot? Or something simil
wjmaclean
2016/02/29 23:33:55
Done.
|
| + RenderWidgetHostViewBase* root_view = GetRootRenderWidgetHostView(); |
| + if (root_view) |
| + root_view->Focus(); |
| +} |
| + |
| void CrossProcessFrameConnector::OnForwardInputEvent( |
| const blink::WebInputEvent* event) { |
| if (!view_) |
| @@ -168,6 +181,10 @@ void CrossProcessFrameConnector::OnForwardInputEvent( |
| ? manager->GetOuterRenderWidgetHostForKeyboardInput() |
| : frame_proxy_in_parent_renderer_->GetRenderViewHost()->GetWidget(); |
| + // TODO(wjmaclean): We should remove these forwarding functions, since they |
| + // are directly target using RenderWidgetHostInputEventRouter. But neither |
| + // pathway is currently handling gesture events, so that needs to be fixed |
| + // in a subsequent CL. |
| if (blink::WebInputEvent::isKeyboardEventType(event->type)) { |
| if (!parent_widget->GetLastKeyboardEvent()) |
| return; |