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

Side by Side Diff: content/browser/renderer_host/input/input_router_impl.cc

Issue 2050033002: Revert of Remove enable/disable wheel gestures setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_remove
Patch Set: Created 4 years, 6 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/browser/renderer_host/input/input_router_impl.h" 5 #include "content/browser/renderer_host/input/input_router_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/auto_reset.h" 11 #include "base/auto_reset.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "content/browser/renderer_host/input/gesture_event_queue.h" 16 #include "content/browser/renderer_host/input/gesture_event_queue.h"
17 #include "content/browser/renderer_host/input/input_ack_handler.h" 17 #include "content/browser/renderer_host/input/input_ack_handler.h"
18 #include "content/browser/renderer_host/input/input_router_client.h" 18 #include "content/browser/renderer_host/input/input_router_client.h"
19 #include "content/browser/renderer_host/input/touch_event_queue.h" 19 #include "content/browser/renderer_host/input/touch_event_queue.h"
20 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controlle r.h" 20 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controlle r.h"
21 #include "content/common/content_constants_internal.h" 21 #include "content/common/content_constants_internal.h"
22 #include "content/common/edit_command.h" 22 #include "content/common/edit_command.h"
23 #include "content/common/input/input_event_ack_state.h" 23 #include "content/common/input/input_event_ack_state.h"
24 #include "content/common/input/input_event_utils.h"
24 #include "content/common/input/touch_action.h" 25 #include "content/common/input/touch_action.h"
25 #include "content/common/input/web_touch_event_traits.h" 26 #include "content/common/input/web_touch_event_traits.h"
26 #include "content/common/input_messages.h" 27 #include "content/common/input_messages.h"
27 #include "content/common/view_messages.h" 28 #include "content/common/view_messages.h"
28 #include "content/public/browser/notification_service.h" 29 #include "content/public/browser/notification_service.h"
29 #include "content/public/browser/notification_types.h" 30 #include "content/public/browser/notification_types.h"
30 #include "content/public/browser/user_metrics.h" 31 #include "content/public/browser/user_metrics.h"
31 #include "content/public/common/content_switches.h" 32 #include "content/public/common/content_switches.h"
32 #include "ipc/ipc_sender.h" 33 #include "ipc/ipc_sender.h"
33 #include "ui/events/blink/blink_event_util.h" 34 #include "ui/events/blink/blink_event_util.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 ack_handler_(ack_handler), 77 ack_handler_(ack_handler),
77 routing_id_(routing_id), 78 routing_id_(routing_id),
78 frame_tree_node_id_(-1), 79 frame_tree_node_id_(-1),
79 select_message_pending_(false), 80 select_message_pending_(false),
80 move_caret_pending_(false), 81 move_caret_pending_(false),
81 mouse_move_pending_(false), 82 mouse_move_pending_(false),
82 current_ack_source_(ACK_SOURCE_NONE), 83 current_ack_source_(ACK_SOURCE_NONE),
83 flush_requested_(false), 84 flush_requested_(false),
84 active_renderer_fling_count_(0), 85 active_renderer_fling_count_(0),
85 touch_scroll_started_sent_(false), 86 touch_scroll_started_sent_(false),
86 wheel_event_queue_(this, kDefaultWheelScrollTransactionMs), 87 wheel_event_queue_(this,
88 UseGestureBasedWheelScrolling(),
89 kDefaultWheelScrollTransactionMs),
87 touch_event_queue_(this, config.touch_config), 90 touch_event_queue_(this, config.touch_config),
88 gesture_event_queue_(this, this, config.gesture_config), 91 gesture_event_queue_(this, this, config.gesture_config),
89 device_scale_factor_(1.f) { 92 device_scale_factor_(1.f) {
90 DCHECK(sender); 93 DCHECK(sender);
91 DCHECK(client); 94 DCHECK(client);
92 DCHECK(ack_handler); 95 DCHECK(ack_handler);
93 UpdateTouchAckTimeoutEnabled(); 96 UpdateTouchAckTimeoutEnabled();
94 } 97 }
95 98
96 InputRouterImpl::~InputRouterImpl() { 99 InputRouterImpl::~InputRouterImpl() {
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 650
648 flush_requested_ = false; 651 flush_requested_ = false;
649 client_->DidFlush(); 652 client_->DidFlush();
650 } 653 }
651 654
652 void InputRouterImpl::SetFrameTreeNodeId(int frameTreeNodeId) { 655 void InputRouterImpl::SetFrameTreeNodeId(int frameTreeNodeId) {
653 frame_tree_node_id_ = frameTreeNodeId; 656 frame_tree_node_id_ = frameTreeNodeId;
654 } 657 }
655 658
656 } // namespace content 659 } // namespace content
OLDNEW
« no previous file with comments | « components/test_runner/web_test_proxy.cc ('k') | content/browser/renderer_host/input/input_router_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698