| 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/common/input/did_overscroll_params.h" | |
| 10 #include "content/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
| 11 #include "content/renderer/input/input_event_filter.h" | 10 #include "content/renderer/input/input_event_filter.h" |
| 12 #include "content/renderer/input/input_handler_manager.h" | 11 #include "content/renderer/input/input_handler_manager.h" |
| 13 #include "third_party/WebKit/public/platform/Platform.h" | 12 #include "third_party/WebKit/public/platform/Platform.h" |
| 13 #include "ui/events/blink/did_overscroll_params.h" |
| 14 | 14 |
| 15 namespace content { | 15 namespace content { |
| 16 | 16 |
| 17 InputHandlerWrapper::InputHandlerWrapper( | 17 InputHandlerWrapper::InputHandlerWrapper( |
| 18 InputHandlerManager* input_handler_manager, | 18 InputHandlerManager* input_handler_manager, |
| 19 int routing_id, | 19 int routing_id, |
| 20 const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner, | 20 const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner, |
| 21 const base::WeakPtr<cc::InputHandler>& input_handler, | 21 const base::WeakPtr<cc::InputHandler>& input_handler, |
| 22 const base::WeakPtr<RenderViewImpl>& render_view_impl, | 22 const base::WeakPtr<RenderViewImpl>& render_view_impl, |
| 23 bool enable_smooth_scrolling) | 23 bool enable_smooth_scrolling) |
| (...skipping 27 matching lines...) Expand all Loading... |
| 51 DidStartFlinging(); | 51 DidStartFlinging(); |
| 52 return blink::Platform::current()->createFlingAnimationCurve( | 52 return blink::Platform::current()->createFlingAnimationCurve( |
| 53 deviceSource, velocity, cumulative_scroll); | 53 deviceSource, velocity, cumulative_scroll); |
| 54 } | 54 } |
| 55 | 55 |
| 56 void InputHandlerWrapper::DidOverscroll( | 56 void InputHandlerWrapper::DidOverscroll( |
| 57 const gfx::Vector2dF& accumulated_overscroll, | 57 const gfx::Vector2dF& accumulated_overscroll, |
| 58 const gfx::Vector2dF& latest_overscroll_delta, | 58 const gfx::Vector2dF& latest_overscroll_delta, |
| 59 const gfx::Vector2dF& current_fling_velocity, | 59 const gfx::Vector2dF& current_fling_velocity, |
| 60 const gfx::PointF& causal_event_viewport_point) { | 60 const gfx::PointF& causal_event_viewport_point) { |
| 61 DidOverscrollParams params; | 61 ui::DidOverscrollParams params; |
| 62 params.accumulated_overscroll = accumulated_overscroll; | 62 params.accumulated_overscroll = accumulated_overscroll; |
| 63 params.latest_overscroll_delta = latest_overscroll_delta; | 63 params.latest_overscroll_delta = latest_overscroll_delta; |
| 64 params.current_fling_velocity = current_fling_velocity; | 64 params.current_fling_velocity = current_fling_velocity; |
| 65 params.causal_event_viewport_point = causal_event_viewport_point; | 65 params.causal_event_viewport_point = causal_event_viewport_point; |
| 66 input_handler_manager_->DidOverscroll(routing_id_, params); | 66 input_handler_manager_->DidOverscroll(routing_id_, params); |
| 67 } | 67 } |
| 68 | 68 |
| 69 void InputHandlerWrapper::DidStartFlinging() { | 69 void InputHandlerWrapper::DidStartFlinging() { |
| 70 input_handler_manager_->DidStartFlinging(routing_id_); | 70 input_handler_manager_->DidStartFlinging(routing_id_); |
| 71 } | 71 } |
| 72 | 72 |
| 73 void InputHandlerWrapper::DidStopFlinging() { | 73 void InputHandlerWrapper::DidStopFlinging() { |
| 74 input_handler_manager_->DidStopFlinging(routing_id_); | 74 input_handler_manager_->DidStopFlinging(routing_id_); |
| 75 } | 75 } |
| 76 | 76 |
| 77 void InputHandlerWrapper::DidAnimateForInput() { | 77 void InputHandlerWrapper::DidAnimateForInput() { |
| 78 input_handler_manager_->DidAnimateForInput(); | 78 input_handler_manager_->DidAnimateForInput(); |
| 79 } | 79 } |
| 80 | 80 |
| 81 } // namespace content | 81 } // namespace content |
| OLD | NEW |