| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 ui::WebScopedInputEvent event, | 54 ui::WebScopedInputEvent event, |
| 55 const ui::LatencyInfo& latency_info) { | 55 const ui::LatencyInfo& latency_info) { |
| 56 input_handler_manager_->DispatchNonBlockingEventToMainThread( | 56 input_handler_manager_->DispatchNonBlockingEventToMainThread( |
| 57 routing_id_, std::move(event), latency_info); | 57 routing_id_, std::move(event), latency_info); |
| 58 } | 58 } |
| 59 | 59 |
| 60 void InputHandlerWrapper::WillShutdown() { | 60 void InputHandlerWrapper::WillShutdown() { |
| 61 input_handler_manager_->RemoveInputHandler(routing_id_); | 61 input_handler_manager_->RemoveInputHandler(routing_id_); |
| 62 } | 62 } |
| 63 | 63 |
| 64 std::unique_ptr<blink::WebGestureCurve> | 64 blink::WebGestureCurve* InputHandlerWrapper::CreateFlingAnimationCurve( |
| 65 InputHandlerWrapper::CreateFlingAnimationCurve( | |
| 66 blink::WebGestureDevice deviceSource, | 65 blink::WebGestureDevice deviceSource, |
| 67 const blink::WebFloatPoint& velocity, | 66 const blink::WebFloatPoint& velocity, |
| 68 const blink::WebSize& cumulative_scroll) { | 67 const blink::WebSize& cumulative_scroll) { |
| 69 return blink::Platform::Current()->CreateFlingAnimationCurve( | 68 return blink::Platform::Current()->CreateFlingAnimationCurve( |
| 70 deviceSource, velocity, cumulative_scroll); | 69 deviceSource, velocity, cumulative_scroll); |
| 71 } | 70 } |
| 72 | 71 |
| 73 void InputHandlerWrapper::DidOverscroll( | 72 void InputHandlerWrapper::DidOverscroll( |
| 74 const gfx::Vector2dF& accumulated_overscroll, | 73 const gfx::Vector2dF& accumulated_overscroll, |
| 75 const gfx::Vector2dF& latest_overscroll_delta, | 74 const gfx::Vector2dF& latest_overscroll_delta, |
| 76 const gfx::Vector2dF& current_fling_velocity, | 75 const gfx::Vector2dF& current_fling_velocity, |
| 77 const gfx::PointF& causal_event_viewport_point) { | 76 const gfx::PointF& causal_event_viewport_point) { |
| 78 ui::DidOverscrollParams params; | 77 ui::DidOverscrollParams params; |
| 79 params.accumulated_overscroll = accumulated_overscroll; | 78 params.accumulated_overscroll = accumulated_overscroll; |
| 80 params.latest_overscroll_delta = latest_overscroll_delta; | 79 params.latest_overscroll_delta = latest_overscroll_delta; |
| 81 params.current_fling_velocity = current_fling_velocity; | 80 params.current_fling_velocity = current_fling_velocity; |
| 82 params.causal_event_viewport_point = causal_event_viewport_point; | 81 params.causal_event_viewport_point = causal_event_viewport_point; |
| 83 input_handler_manager_->DidOverscroll(routing_id_, params); | 82 input_handler_manager_->DidOverscroll(routing_id_, params); |
| 84 } | 83 } |
| 85 | 84 |
| 86 void InputHandlerWrapper::DidStopFlinging() { | 85 void InputHandlerWrapper::DidStopFlinging() { |
| 87 input_handler_manager_->DidStopFlinging(routing_id_); | 86 input_handler_manager_->DidStopFlinging(routing_id_); |
| 88 } | 87 } |
| 89 | 88 |
| 90 void InputHandlerWrapper::DidAnimateForInput() { | 89 void InputHandlerWrapper::DidAnimateForInput() { |
| 91 input_handler_manager_->DidAnimateForInput(); | 90 input_handler_manager_->DidAnimateForInput(); |
| 92 } | 91 } |
| 93 | 92 |
| 94 } // namespace content | 93 } // namespace content |
| OLD | NEW |