Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Side by Side Diff: content/renderer/input/input_handler_wrapper.cc

Issue 2630603002: Revert of Touchpad and wheel scroll latching for ChromeOS behind flag. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
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"
14 #include "ui/events/blink/did_overscroll_params.h" 13 #include "ui/events/blink/did_overscroll_params.h"
15 14
16 namespace content { 15 namespace content {
17 16
18 InputHandlerWrapper::InputHandlerWrapper( 17 InputHandlerWrapper::InputHandlerWrapper(
19 InputHandlerManager* input_handler_manager, 18 InputHandlerManager* input_handler_manager,
20 int routing_id, 19 int routing_id,
21 const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner, 20 const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner,
22 const base::WeakPtr<cc::InputHandler>& input_handler, 21 const base::WeakPtr<cc::InputHandler>& input_handler,
23 const base::WeakPtr<RenderViewImpl>& render_view_impl, 22 const base::WeakPtr<RenderViewImpl>& render_view_impl,
24 bool enable_smooth_scrolling) 23 bool enable_smooth_scrolling)
25 : input_handler_manager_(input_handler_manager), 24 : input_handler_manager_(input_handler_manager),
26 routing_id_(routing_id), 25 routing_id_(routing_id),
27 input_handler_proxy_(input_handler.get(), this), 26 input_handler_proxy_(input_handler.get(), this),
28 main_task_runner_(main_task_runner), 27 main_task_runner_(main_task_runner),
29 render_view_impl_(render_view_impl) { 28 render_view_impl_(render_view_impl) {
30 DCHECK(input_handler); 29 DCHECK(input_handler);
31 input_handler_proxy_.set_smooth_scroll_enabled(enable_smooth_scrolling); 30 input_handler_proxy_.set_smooth_scroll_enabled(enable_smooth_scrolling);
32 input_handler_proxy_.set_touchpad_and_wheel_scroll_latching_enabled(
33 base::FeatureList::IsEnabled(features::kTouchpadAndWheelScrollLatching));
34 } 31 }
35 32
36 InputHandlerWrapper::~InputHandlerWrapper() { 33 InputHandlerWrapper::~InputHandlerWrapper() {
37 } 34 }
38 35
39 void InputHandlerWrapper::NeedsMainFrame() { 36 void InputHandlerWrapper::NeedsMainFrame() {
40 main_task_runner_->PostTask( 37 main_task_runner_->PostTask(
41 FROM_HERE, 38 FROM_HERE,
42 base::Bind(&RenderViewImpl::SetNeedsMainFrame, render_view_impl_)); 39 base::Bind(&RenderViewImpl::SetNeedsMainFrame, render_view_impl_));
43 } 40 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 80
84 void InputHandlerWrapper::DidStopFlinging() { 81 void InputHandlerWrapper::DidStopFlinging() {
85 input_handler_manager_->DidStopFlinging(routing_id_); 82 input_handler_manager_->DidStopFlinging(routing_id_);
86 } 83 }
87 84
88 void InputHandlerWrapper::DidAnimateForInput() { 85 void InputHandlerWrapper::DidAnimateForInput() {
89 input_handler_manager_->DidAnimateForInput(); 86 input_handler_manager_->DidAnimateForInput();
90 } 87 }
91 88
92 } // namespace content 89 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/input/mouse_wheel_event_queue.cc ('k') | ui/events/blink/input_handler_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698