Index: content/browser/renderer_host/input/touch_event_queue.h |
diff --git a/content/browser/renderer_host/input/touch_event_queue.h b/content/browser/renderer_host/input/touch_event_queue.h |
index cdd5d29ae55938c981118945b7d6eae4650c40f6..584935f641cbe341bd6036238c6d921e00095e68 100644 |
--- a/content/browser/renderer_host/input/touch_event_queue.h |
+++ b/content/browser/renderer_host/input/touch_event_queue.h |
@@ -38,31 +38,9 @@ class CONTENT_EXPORT TouchEventQueueClient { |
// 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; |
@@ -212,8 +190,7 @@ class CONTENT_EXPORT TouchEventQueue { |
// 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. |
@@ -232,11 +209,6 @@ class CONTENT_EXPORT TouchEventQueue { |
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_; |