| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/input/input_handler_wrapper.h" | 5 #include "content/renderer/input/input_handler_wrapper.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "content/public/common/content_features.h" | 9 #include "content/public/common/content_features.h" |
| 10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 const blink::WebFloatPoint& velocity, | 68 const blink::WebFloatPoint& velocity, |
| 69 const blink::WebSize& cumulative_scroll) { | 69 const blink::WebSize& cumulative_scroll) { |
| 70 return blink::Platform::Current()->CreateFlingAnimationCurve( | 70 return blink::Platform::Current()->CreateFlingAnimationCurve( |
| 71 deviceSource, velocity, cumulative_scroll); | 71 deviceSource, velocity, cumulative_scroll); |
| 72 } | 72 } |
| 73 | 73 |
| 74 void InputHandlerWrapper::DidOverscroll( | 74 void InputHandlerWrapper::DidOverscroll( |
| 75 const gfx::Vector2dF& accumulated_overscroll, | 75 const gfx::Vector2dF& accumulated_overscroll, |
| 76 const gfx::Vector2dF& latest_overscroll_delta, | 76 const gfx::Vector2dF& latest_overscroll_delta, |
| 77 const gfx::Vector2dF& current_fling_velocity, | 77 const gfx::Vector2dF& current_fling_velocity, |
| 78 const gfx::PointF& causal_event_viewport_point) { | 78 const gfx::PointF& causal_event_viewport_point, |
| 79 const cc::ScrollBoundaryBehavior& scroll_boundary_behavior) { |
| 79 ui::DidOverscrollParams params; | 80 ui::DidOverscrollParams params; |
| 80 params.accumulated_overscroll = accumulated_overscroll; | 81 params.accumulated_overscroll = accumulated_overscroll; |
| 81 params.latest_overscroll_delta = latest_overscroll_delta; | 82 params.latest_overscroll_delta = latest_overscroll_delta; |
| 82 params.current_fling_velocity = current_fling_velocity; | 83 params.current_fling_velocity = current_fling_velocity; |
| 83 params.causal_event_viewport_point = causal_event_viewport_point; | 84 params.causal_event_viewport_point = causal_event_viewport_point; |
| 85 params.scroll_boundary_behavior = scroll_boundary_behavior; |
| 84 input_handler_manager_->DidOverscroll(routing_id_, params); | 86 input_handler_manager_->DidOverscroll(routing_id_, params); |
| 85 } | 87 } |
| 86 | 88 |
| 87 void InputHandlerWrapper::DidStopFlinging() { | 89 void InputHandlerWrapper::DidStopFlinging() { |
| 88 input_handler_manager_->DidStopFlinging(routing_id_); | 90 input_handler_manager_->DidStopFlinging(routing_id_); |
| 89 } | 91 } |
| 90 | 92 |
| 91 void InputHandlerWrapper::DidAnimateForInput() { | 93 void InputHandlerWrapper::DidAnimateForInput() { |
| 92 input_handler_manager_->DidAnimateForInput(); | 94 input_handler_manager_->DidAnimateForInput(); |
| 93 } | 95 } |
| (...skipping 18 matching lines...) Expand all Loading... |
| 112 | 114 |
| 113 void InputHandlerWrapper::SetWhiteListedTouchAction( | 115 void InputHandlerWrapper::SetWhiteListedTouchAction( |
| 114 cc::TouchAction touch_action, | 116 cc::TouchAction touch_action, |
| 115 uint32_t unique_touch_event_id, | 117 uint32_t unique_touch_event_id, |
| 116 ui::InputHandlerProxy::EventDisposition event_disposition) { | 118 ui::InputHandlerProxy::EventDisposition event_disposition) { |
| 117 input_handler_manager_->SetWhiteListedTouchAction( | 119 input_handler_manager_->SetWhiteListedTouchAction( |
| 118 routing_id_, touch_action, unique_touch_event_id, event_disposition); | 120 routing_id_, touch_action, unique_touch_event_id, event_disposition); |
| 119 } | 121 } |
| 120 | 122 |
| 121 } // namespace content | 123 } // namespace content |
| OLD | NEW |