| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/renderer/render_widget.h" | 5 #include "content/renderer/render_widget.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 995 } | 995 } |
| 996 | 996 |
| 997 void RenderWidget::OnInputEventAck( | 997 void RenderWidget::OnInputEventAck( |
| 998 std::unique_ptr<InputEventAck> input_event_ack) { | 998 std::unique_ptr<InputEventAck> input_event_ack) { |
| 999 SendOrCrash( | 999 SendOrCrash( |
| 1000 new InputHostMsg_HandleInputEvent_ACK(routing_id_, *input_event_ack)); | 1000 new InputHostMsg_HandleInputEvent_ACK(routing_id_, *input_event_ack)); |
| 1001 } | 1001 } |
| 1002 | 1002 |
| 1003 void RenderWidget::NotifyInputEventHandled( | 1003 void RenderWidget::NotifyInputEventHandled( |
| 1004 blink::WebInputEvent::Type handled_type, | 1004 blink::WebInputEvent::Type handled_type, |
| 1005 blink::WebInputEventResult result, |
| 1005 InputEventAckState ack_result) { | 1006 InputEventAckState ack_result) { |
| 1006 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 1007 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
| 1007 InputHandlerManager* input_handler_manager = | 1008 InputHandlerManager* input_handler_manager = |
| 1008 render_thread ? render_thread->input_handler_manager() : NULL; | 1009 render_thread ? render_thread->input_handler_manager() : NULL; |
| 1009 if (input_handler_manager) { | 1010 if (input_handler_manager) { |
| 1010 input_handler_manager->NotifyInputEventHandledOnMainThread( | 1011 input_handler_manager->NotifyInputEventHandledOnMainThread( |
| 1011 routing_id_, handled_type, ack_result); | 1012 routing_id_, handled_type, result, ack_result); |
| 1012 } | 1013 } |
| 1013 } | 1014 } |
| 1014 | 1015 |
| 1015 void RenderWidget::SetInputHandler(RenderWidgetInputHandler* input_handler) { | 1016 void RenderWidget::SetInputHandler(RenderWidgetInputHandler* input_handler) { |
| 1016 // Nothing to do here. RenderWidget created the |input_handler| and will take | 1017 // Nothing to do here. RenderWidget created the |input_handler| and will take |
| 1017 // ownership of it. We just verify here that we don't already have an input | 1018 // ownership of it. We just verify here that we don't already have an input |
| 1018 // handler. | 1019 // handler. |
| 1019 DCHECK(!input_handler_); | 1020 DCHECK(!input_handler_); |
| 1020 } | 1021 } |
| 1021 | 1022 |
| (...skipping 1241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2263 // browser side (https://crbug.com/669219). | 2264 // browser side (https://crbug.com/669219). |
| 2264 // If there is no WebFrameWidget, then there will be no | 2265 // If there is no WebFrameWidget, then there will be no |
| 2265 // InputMethodControllers for a WebLocalFrame. | 2266 // InputMethodControllers for a WebLocalFrame. |
| 2266 return nullptr; | 2267 return nullptr; |
| 2267 } | 2268 } |
| 2268 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) | 2269 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) |
| 2269 ->getActiveWebInputMethodController(); | 2270 ->getActiveWebInputMethodController(); |
| 2270 } | 2271 } |
| 2271 | 2272 |
| 2272 } // namespace content | 2273 } // namespace content |
| OLD | NEW |