Remove touch-scrolling-mode flag

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 20 matching lines @@
       const TouchEventWithLatencyInfo& event) = 0;
 
   virtual void OnTouchEventAck(
       const TouchEventWithLatencyInfo& event,
       InputEventAckState ack_result) = 0;
 };
 
 // A queue for throttling and coalescing touch-events.
 class CONTENT_EXPORT TouchEventQueue {
  public:
-  // Different ways of dealing with touch events during scrolling.
-  // TODO(rbyers): Remove this once we're confident that touch move absorption
-  // is OK. http://crbug.com/350430
-  enum TouchScrollingMode {
-    // Send a touchcancel on scroll start and no further touch events for the
-    // duration of the scroll.  Chrome Android's traditional behavior.
-    TOUCH_SCROLLING_MODE_TOUCHCANCEL,
-    // Send touchmove events throughout a scroll, blocking on each ACK and
-    // 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 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.
@@ skipping 129 matching lines @@
   // ack after forwarding a touch event to the client.
   bool dispatching_touch_;
 
   // Whether the renderer has at least one touch handler.
   bool has_handlers_;
 
   // Whether to allow any remaining touches for the current sequence. Note that
   // this is a stricter condition than an empty |touch_consumer_states_|, as it
   // also prevents forwarding of touchstart events for new pointers in the
   // current sequence. This is only used when the event is synthetically
-  // cancelled after a touch timeout, or after a scroll event when the
-  // mode is TOUCH_SCROLLING_MODE_TOUCHCANCEL.
+  // cancelled after a touch timeout.
   bool drop_remaining_touches_in_sequence_;
 
   // Optional handler for timed-out touch event acks.
   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_|
   // 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_;
   scoped_ptr<TouchEventWithLatencyInfo> pending_async_touchmove_;
   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_;
-
   // Event is saved to compare pointer positions for new touchmove events.
   scoped_ptr<blink::WebTouchEvent> last_sent_touchevent_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchEventQueue);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_EVENT_QUEUE_H_