Delegate touch handler registration logic to the TouchEventQueue

content/browser/renderer_host/input/touch_event_queue.h

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 ea7eb71fe5ae516e76d30b3824d18317c2845425..aa211af8a649e6dfd5f233b55d17e203c99618d4 100644
--- a/content/browser/renderer_host/input/touch_event_queue.h
+++ b/content/browser/renderer_host/input/touch_event_queue.h
@@ -58,9 +58,8 @@ class CONTENT_EXPORT TouchEventQueue {
   // resume the normal flow of sending touch events to the renderer.
   void OnGestureScrollEvent(const GestureEventWithLatencyInfo& gesture_event);
 
-  // Empties the queue of touch events. This may result in any number of gesture
-  // events being sent to the renderer.
-  void FlushQueue();
+  // 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.
@@ -82,6 +81,10 @@ class CONTENT_EXPORT TouchEventQueue {
     return ack_timeout_enabled_;
   }
 
+  bool has_handlers() const {
+    return has_handlers_;
+  }
+
  private:
   class TouchTimeoutHandler;
   friend class TouchTimeoutHandler;
@@ -91,6 +94,10 @@ class CONTENT_EXPORT TouchEventQueue {
   bool IsTimeoutRunningForTesting() const;
   const TouchEventWithLatencyInfo& GetLatestEventForTesting() const;
 
+  // Empties the queue of touch events. This may result in any number of gesture
+  // events being sent to the renderer.
+  void FlushQueue();
+
   // Walks the queue, checking each event for |ShouldForwardToRenderer()|.
   // If true, forwards the touch event and stops processing further events.
   // If false, acks the event with |INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS|.
@@ -126,8 +133,11 @@ class CONTENT_EXPORT TouchEventQueue {
   // ack after forwarding a touch event to the client.
   bool dispatching_touch_;
 
+  // Whether there are any registered touch handlers. Defaults to false.
+  bool has_handlers_;
+
   // Don't send touch events to the renderer while scrolling.
-  bool no_touch_to_renderer_;
+  bool scroll_in_progress_;

[tdresser, 2014/01/09 21:14:32]

Good rename.

 
   // Whether an event in the current (multi)touch sequence was consumed by the
   // renderer.  The touch timeout will never be activated when this is true.