| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 975 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 986 } | 986 } |
| 987 | 987 |
| 988 void RenderWidget::OnDidOverscroll(const DidOverscrollParams& params) { | 988 void RenderWidget::OnDidOverscroll(const DidOverscrollParams& params) { |
| 989 Send(new InputHostMsg_DidOverscroll(routing_id_, params)); | 989 Send(new InputHostMsg_DidOverscroll(routing_id_, params)); |
| 990 } | 990 } |
| 991 | 991 |
| 992 void RenderWidget::OnInputEventAck(scoped_ptr<InputEventAck> input_event_ack) { | 992 void RenderWidget::OnInputEventAck(scoped_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::NonBlockingInputEventHandled( | 996 void RenderWidget::NotifyInputEventHandled( |
| 997 blink::WebInputEvent::Type handled_type) { | 997 blink::WebInputEvent::Type handled_type) { |
| 998 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 998 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
| 999 InputHandlerManager* input_handler_manager = | 999 InputHandlerManager* input_handler_manager = |
| 1000 render_thread ? render_thread->input_handler_manager() : NULL; | 1000 render_thread ? render_thread->input_handler_manager() : NULL; |
| 1001 if (input_handler_manager) { | 1001 if (input_handler_manager) { |
| 1002 input_handler_manager->NonBlockingInputEventHandledOnMainThread( | 1002 input_handler_manager->NotifyInputEventHandledOnMainThread(routing_id_, |
| 1003 routing_id_, handled_type); | 1003 handled_type); |
| 1004 } | 1004 } |
| 1005 } | 1005 } |
| 1006 | 1006 |
| 1007 void RenderWidget::SetInputHandler(RenderWidgetInputHandler* input_handler) { | 1007 void RenderWidget::SetInputHandler(RenderWidgetInputHandler* input_handler) { |
| 1008 // Nothing to do here. RenderWidget created the |input_handler| and will take | 1008 // 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 | 1009 // ownership of it. We just verify here that we don't already have an input |
| 1010 // handler. | 1010 // handler. |
| 1011 DCHECK(!input_handler_); | 1011 DCHECK(!input_handler_); |
| 1012 } | 1012 } |
| 1013 | 1013 |
| (...skipping 1170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2184 } | 2184 } |
| 2185 | 2185 |
| 2186 float RenderWidget::GetOriginalDeviceScaleFactor() const { | 2186 float RenderWidget::GetOriginalDeviceScaleFactor() const { |
| 2187 return | 2187 return |
| 2188 screen_metrics_emulator_ ? | 2188 screen_metrics_emulator_ ? |
| 2189 screen_metrics_emulator_->original_screen_info().deviceScaleFactor : | 2189 screen_metrics_emulator_->original_screen_info().deviceScaleFactor : |
| 2190 device_scale_factor_; | 2190 device_scale_factor_; |
| 2191 } | 2191 } |
| 2192 | 2192 |
| 2193 } // namespace content | 2193 } // namespace content |
| OLD | NEW |