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

Unified Diff: content/browser/renderer_host/input/input_router_impl.h

Issue 260923003: Revert of Consolidate all touch/gesture related constants in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/input/input_router_impl.h
diff --git a/content/browser/renderer_host/input/input_router_impl.h b/content/browser/renderer_host/input/input_router_impl.h
index 1fbf9d9c5016c49d0d59cb35c46f5395e1b8f990..8c512348a6bcf93988e02c4bf627d8055f9ce7fe 100644
--- a/content/browser/renderer_host/input/input_router_impl.h
+++ b/content/browser/renderer_host/input/input_router_impl.h
@@ -40,17 +40,10 @@
public NON_EXPORTED_BASE(TouchEventQueueClient),
public NON_EXPORTED_BASE(TouchpadTapSuppressionControllerClient) {
public:
- struct CONTENT_EXPORT Config {
- Config();
- GestureEventQueue::Config gesture_config;
- TouchEventQueue::Config touch_config;
- };
-
InputRouterImpl(IPC::Sender* sender,
InputRouterClient* client,
InputAckHandler* ack_handler,
- int routing_id,
- const Config& config);
+ int routing_id);
virtual ~InputRouterImpl();
// InputRouter
@@ -180,9 +173,8 @@
// Called when a touch timeout-affecting bit has changed, in turn toggling the
// touch ack timeout feature of the |touch_event_queue_| as appropriate. Input
- // to that determination includes current view properties and the allowed
- // touch action. Note that this will only affect platforms that have a
- // non-zero touch timeout configuration.
+ // to that determination includes current view properties, the allowed touch
+ // action and the command-line configured |touch_ack_timeout_supported_|.
void UpdateTouchAckTimeoutEnabled();
// If a flush has been requested, signals a completed flush to the client if
@@ -245,6 +237,10 @@
// The time when an input event was sent to the client.
base::TimeTicks input_event_start_time_;
+ // Whether touch ack timeout handling has been enabled via the command line.
+ bool touch_ack_timeout_supported_;
+ base::TimeDelta touch_ack_timeout_delay_;
+
// Cached flags from |OnViewUpdated()|, defaults to 0.
int current_view_flags_;

Powered by Google App Engine
This is Rietveld 408576698