Revert of Consolidate all touch/gesture related constants in content

content/browser/renderer_host/input/touch_event_queue.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_EVENT_QUEUE_H_
 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_EVENT_QUEUE_H_
 
 #include <deque>
 #include <map>
 
@@ skipping 37 matching lines @@
     // using the disposition to determine whether a scroll update should be
     // sent.  Mobile Safari's default overflow scroll behavior.
     TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE,
     // Send touchmove events throughout a scroll, but throttle sending and
     // ignore the ACK as long as scrolling remains possible.  Unconsumed scroll
     // events return touchmove events to being dispatched synchronously.
     TOUCH_SCROLLING_MODE_ASYNC_TOUCHMOVE,
     TOUCH_SCROLLING_MODE_DEFAULT = TOUCH_SCROLLING_MODE_ASYNC_TOUCHMOVE
   };
 
-  struct CONTENT_EXPORT Config {
-    Config();
-
-    // Determines the bounds of the (square) touchmove slop suppression region.
-    // Defaults to 0 (disabled).
-    double touchmove_slop_suppression_length_dips;
-
-    // Determines the type of touch scrolling.
-    // Defaults to TouchEventQueue:::TOUCH_SCROLLING_MODE_DEFAULT.
-    TouchEventQueue::TouchScrollingMode touch_scrolling_mode;
-
-    // Controls whether touch ack timeouts will trigger touch cancellation.
-    // Defaults to 200ms.
-    base::TimeDelta touch_ack_timeout_delay;
-
-    // Whether the platform supports touch ack timeout behavior.
-    // Defaults to false (disabled).
-    bool touch_ack_timeout_supported;
-  };
-
-  // The |client| must outlive the TouchEventQueue.
-  TouchEventQueue(TouchEventQueueClient* client, const Config& config);
-
+  // The |client| must outlive the TouchEventQueue. If
+  // |touchmove_suppression_length_dips| <= 0, touch move suppression is
+  // disabled.
+  TouchEventQueue(TouchEventQueueClient* client,
+                  TouchScrollingMode mode,
+                  double touchmove_suppression_length_dips);
   ~TouchEventQueue();
 
   // Adds an event to the queue. The event may be coalesced with previously
   // queued events (e.g. consecutive touch-move events can be coalesced into a
   // single touch-move event). The event may also be immediately forwarded to
   // the renderer (e.g. when there are no other queued touch event).
   void QueueEvent(const TouchEventWithLatencyInfo& event);
 
   // Notifies the queue that a touch-event has been processed by the renderer.
   // At this point, the queue may send one or more gesture events and/or
@@ skipping 14 matching lines @@
   // Notifies the queue whether the renderer has at least one touch handler.
   void OnHasTouchEventHandlers(bool has_handlers);
 
   // Returns whether the currently pending touch event (waiting ACK) is for
   // a touch start event.
   bool IsPendingAckTouchStart() const;
 
   // Sets whether a delayed touch ack will cancel and flush the current
   // touch sequence. Note that, if the timeout was previously disabled, enabling
   // it will take effect only for the following touch sequence.
-  void SetAckTimeoutEnabled(bool enabled);
+  void SetAckTimeoutEnabled(bool enabled, base::TimeDelta ack_timeout_delay);
 
   bool empty() const WARN_UNUSED_RESULT {
     return touch_queue_.empty();
   }
 
   size_t size() const {
     return touch_queue_.size();
   }
 
   bool ack_timeout_enabled() const {
@@ skipping 84 matching lines @@
   enum TouchFilteringState {
     FORWARD_ALL_TOUCHES,           // Don't filter at all - the default.
     FORWARD_TOUCHES_UNTIL_TIMEOUT, // Don't filter unless we get an ACK timeout.
     DROP_TOUCHES_IN_SEQUENCE,      // Filter all events until a new touch
                                    // sequence is received.
     DROP_ALL_TOUCHES,              // Filter all events, e.g., no touch handler.
     TOUCH_FILTERING_STATE_DEFAULT = FORWARD_ALL_TOUCHES,
   };
   TouchFilteringState touch_filtering_state_;
 
-  // Optional handler for timed-out touch event acks.
+  // Optional handler for timed-out touch event acks, disabled by default.
   bool ack_timeout_enabled_;
   scoped_ptr<TouchTimeoutHandler> timeout_handler_;
 
   // Suppression of TouchMove's within a slop region when a sequence has not yet
   // been preventDefaulted.
   scoped_ptr<TouchMoveSlopSuppressor> touchmove_slop_suppressor_;
 
   // Whether touch events should remain buffered and dispatched asynchronously
   // while a scroll sequence is active.  In this mode, touchmove's are throttled
-  // and ack'ed immediately, but remain buffered in |pending_async_touchmove_|
+  // and ack'ed immediately, but remain buffered in |pending_async_touch_move_|
   // until a sufficient time period has elapsed since the last sent touch event.
   // For details see the design doc at http://goo.gl/lVyJAa.
   bool send_touch_events_async_;
-  bool needs_async_touchmove_for_outer_slop_region_;
-  scoped_ptr<TouchEventWithLatencyInfo> pending_async_touchmove_;
+  bool needs_async_touch_move_for_outer_slop_region_;
+  scoped_ptr<TouchEventWithLatencyInfo> pending_async_touch_move_;
   double last_sent_touch_timestamp_sec_;
 
   // How touch events are handled during scrolling.  For now this is a global
   // setting for experimentation, but we may evolve it into an app-controlled
   // mode.
   const TouchScrollingMode touch_scrolling_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchEventQueue);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_EVENT_QUEUE_H_