| 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 976 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 987 void RenderWidget::OnDidOverscroll(const DidOverscrollParams& params) { | 987 void RenderWidget::OnDidOverscroll(const DidOverscrollParams& params) { |
| 988 Send(new InputHostMsg_DidOverscroll(routing_id_, params)); | 988 Send(new InputHostMsg_DidOverscroll(routing_id_, params)); |
| 989 } | 989 } |
| 990 | 990 |
| 991 void RenderWidget::OnInputEventAck( | 991 void RenderWidget::OnInputEventAck( |
| 992 std::unique_ptr<InputEventAck> input_event_ack) { | 992 std::unique_ptr<InputEventAck> input_event_ack) { |
| 993 Send(new InputHostMsg_HandleInputEvent_ACK(routing_id_, *input_event_ack)); | 993 Send(new InputHostMsg_HandleInputEvent_ACK(routing_id_, *input_event_ack)); |
| 994 } | 994 } |
| 995 | 995 |
| 996 void RenderWidget::NotifyInputEventHandled( | 996 void RenderWidget::NotifyInputEventHandled( |
| 997 blink::WebInputEvent::Type handled_type) { | 997 blink::WebInputEvent::Type handled_type, |
| 998 InputEventAckState ack_result) { |
| 998 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 999 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
| 999 InputHandlerManager* input_handler_manager = | 1000 InputHandlerManager* input_handler_manager = |
| 1000 render_thread ? render_thread->input_handler_manager() : NULL; | 1001 render_thread ? render_thread->input_handler_manager() : NULL; |
| 1001 if (input_handler_manager) { | 1002 if (input_handler_manager) { |
| 1002 input_handler_manager->NotifyInputEventHandledOnMainThread(routing_id_, | 1003 input_handler_manager->NotifyInputEventHandledOnMainThread( |
| 1003 handled_type); | 1004 routing_id_, handled_type, ack_result); |
| 1004 } | 1005 } |
| 1005 } | 1006 } |
| 1006 | 1007 |
| 1007 void RenderWidget::SetInputHandler(RenderWidgetInputHandler* input_handler) { | 1008 void RenderWidget::SetInputHandler(RenderWidgetInputHandler* input_handler) { |
| 1008 // Nothing to do here. RenderWidget created the |input_handler| and will take | 1009 // Nothing to do here. RenderWidget created the |input_handler| and will take |
| 1009 // ownership of it. We just verify here that we don't already have an input | 1010 // ownership of it. We just verify here that we don't already have an input |
| 1010 // handler. | 1011 // handler. |
| 1011 DCHECK(!input_handler_); | 1012 DCHECK(!input_handler_); |
| 1012 } | 1013 } |
| 1013 | 1014 |
| (...skipping 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2092 } | 2093 } |
| 2093 | 2094 |
| 2094 float RenderWidget::GetOriginalDeviceScaleFactor() const { | 2095 float RenderWidget::GetOriginalDeviceScaleFactor() const { |
| 2095 return | 2096 return |
| 2096 screen_metrics_emulator_ ? | 2097 screen_metrics_emulator_ ? |
| 2097 screen_metrics_emulator_->original_screen_info().deviceScaleFactor : | 2098 screen_metrics_emulator_->original_screen_info().deviceScaleFactor : |
| 2098 device_scale_factor_; | 2099 device_scale_factor_; |
| 2099 } | 2100 } |
| 2100 | 2101 |
| 2101 } // namespace content | 2102 } // namespace content |
| OLD | NEW |