| 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" | 9 #include "content/common/input/did_overscroll_params.h" |
| 10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
| 11 #include "content/renderer/input/input_event_filter.h" | 11 #include "content/renderer/input/input_event_filter.h" |
| 12 #include "content/renderer/input/input_handler_manager.h" | 12 #include "content/renderer/input/input_handler_manager.h" |
| 13 #include "third_party/WebKit/public/platform/Platform.h" | 13 #include "third_party/WebKit/public/platform/Platform.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, |
| 24 bool enable_wheel_gestures) |
| 24 : input_handler_manager_(input_handler_manager), | 25 : input_handler_manager_(input_handler_manager), |
| 25 routing_id_(routing_id), | 26 routing_id_(routing_id), |
| 26 input_handler_proxy_(input_handler.get(), this), | 27 input_handler_proxy_(input_handler.get(), this), |
| 27 main_task_runner_(main_task_runner), | 28 main_task_runner_(main_task_runner), |
| 28 render_view_impl_(render_view_impl) { | 29 render_view_impl_(render_view_impl) { |
| 29 DCHECK(input_handler); | 30 DCHECK(input_handler); |
| 30 input_handler_proxy_.set_smooth_scroll_enabled(enable_smooth_scrolling); | 31 input_handler_proxy_.set_smooth_scroll_enabled(enable_smooth_scrolling); |
| 32 input_handler_proxy_.set_use_gesture_events_for_mouse_wheel( |
| 33 enable_wheel_gestures); |
| 31 } | 34 } |
| 32 | 35 |
| 33 InputHandlerWrapper::~InputHandlerWrapper() { | 36 InputHandlerWrapper::~InputHandlerWrapper() { |
| 34 } | 37 } |
| 35 | 38 |
| 36 void InputHandlerWrapper::TransferActiveWheelFlingAnimation( | 39 void InputHandlerWrapper::TransferActiveWheelFlingAnimation( |
| 37 const blink::WebActiveWheelFlingParameters& params) { | 40 const blink::WebActiveWheelFlingParameters& params) { |
| 38 main_task_runner_->PostTask( | 41 main_task_runner_->PostTask( |
| 39 FROM_HERE, base::Bind(&RenderViewImpl::TransferActiveWheelFlingAnimation, | 42 FROM_HERE, base::Bind(&RenderViewImpl::TransferActiveWheelFlingAnimation, |
| 40 render_view_impl_, params)); | 43 render_view_impl_, params)); |
| (...skipping 26 matching lines...) Expand all Loading... |
| 67 | 70 |
| 68 void InputHandlerWrapper::DidStopFlinging() { | 71 void InputHandlerWrapper::DidStopFlinging() { |
| 69 input_handler_manager_->DidStopFlinging(routing_id_); | 72 input_handler_manager_->DidStopFlinging(routing_id_); |
| 70 } | 73 } |
| 71 | 74 |
| 72 void InputHandlerWrapper::DidAnimateForInput() { | 75 void InputHandlerWrapper::DidAnimateForInput() { |
| 73 input_handler_manager_->DidAnimateForInput(); | 76 input_handler_manager_->DidAnimateForInput(); |
| 74 } | 77 } |
| 75 | 78 |
| 76 } // namespace content | 79 } // namespace content |
| OLD | NEW |