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 944 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
955 input_handler_manager->ObserveWheelEventAndResultOnMainThread( | 955 input_handler_manager->ObserveWheelEventAndResultOnMainThread( |
956 routing_id_, wheel_event, scroll_result); | 956 routing_id_, wheel_event, scroll_result); |
957 } | 957 } |
958 } | 958 } |
959 | 959 |
960 void RenderWidget::OnDidHandleKeyEvent() { | 960 void RenderWidget::OnDidHandleKeyEvent() { |
961 if (owner_delegate_) | 961 if (owner_delegate_) |
962 owner_delegate_->RenderWidgetDidHandleKeyEvent(); | 962 owner_delegate_->RenderWidgetDidHandleKeyEvent(); |
963 } | 963 } |
964 | 964 |
965 void RenderWidget::ObserveGestureEventAndResult( | |
Charlie Reis
2016/03/09 22:49:17
nit: Move above OnDidHandleKeyEvent.
dtapuska
2016/03/10 19:51:15
Done.
| |
966 const blink::WebGestureEvent& gesture_event, | |
967 const gfx::Vector2dF& unused_delta, | |
968 bool event_processed) { | |
969 if (!compositor_deps_->IsElasticOverscrollEnabled()) | |
970 return; | |
971 | |
972 cc::InputHandlerScrollResult scroll_result; | |
973 scroll_result.did_scroll = event_processed; | |
974 scroll_result.did_overscroll_root = !unused_delta.IsZero(); | |
975 scroll_result.unused_scroll_delta = unused_delta; | |
976 | |
977 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | |
978 InputHandlerManager* input_handler_manager = | |
979 render_thread ? render_thread->input_handler_manager() : NULL; | |
980 if (input_handler_manager) { | |
981 input_handler_manager->ObserveGestureEventAndResultOnMainThread( | |
982 routing_id_, gesture_event, scroll_result); | |
983 } | |
984 } | |
985 | |
965 void RenderWidget::OnDidOverscroll(const DidOverscrollParams& params) { | 986 void RenderWidget::OnDidOverscroll(const DidOverscrollParams& params) { |
966 Send(new InputHostMsg_DidOverscroll(routing_id_, params)); | 987 Send(new InputHostMsg_DidOverscroll(routing_id_, params)); |
967 } | 988 } |
968 | 989 |
969 void RenderWidget::OnInputEventAck(scoped_ptr<InputEventAck> input_event_ack) { | 990 void RenderWidget::OnInputEventAck(scoped_ptr<InputEventAck> input_event_ack) { |
970 Send(new InputHostMsg_HandleInputEvent_ACK(routing_id_, *input_event_ack)); | 991 Send(new InputHostMsg_HandleInputEvent_ACK(routing_id_, *input_event_ack)); |
971 } | 992 } |
972 | 993 |
973 void RenderWidget::NonBlockingInputEventHandled( | 994 void RenderWidget::NonBlockingInputEventHandled( |
974 blink::WebInputEvent::Type handled_type) { | 995 blink::WebInputEvent::Type handled_type) { |
(...skipping 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2150 } | 2171 } |
2151 | 2172 |
2152 float RenderWidget::GetOriginalDeviceScaleFactor() const { | 2173 float RenderWidget::GetOriginalDeviceScaleFactor() const { |
2153 return | 2174 return |
2154 screen_metrics_emulator_ ? | 2175 screen_metrics_emulator_ ? |
2155 screen_metrics_emulator_->original_screen_info().deviceScaleFactor : | 2176 screen_metrics_emulator_->original_screen_info().deviceScaleFactor : |
2156 device_scale_factor_; | 2177 device_scale_factor_; |
2157 } | 2178 } |
2158 | 2179 |
2159 } // namespace content | 2180 } // namespace content |
OLD | NEW |