Make touch-action apply to double-tap zoom

content/browser/renderer_host/input/touch_action_filter.cc

 // 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.
 
 #include "content/browser/renderer_host/input/touch_action_filter.h"
 
 #include <math.h>
 
 #include "base/logging.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
 using blink::WebInputEvent;
 using blink::WebGestureEvent;
 
 namespace content {
 
 TouchActionFilter::TouchActionFilter() :
   drop_scroll_gesture_events_(false),
   drop_pinch_gesture_events_(false),
+  drop_current_tap_ending_event_(false),
   allowed_touch_action_(TOUCH_ACTION_AUTO) {
 }
 
 bool TouchActionFilter::FilterGestureEvent(WebGestureEvent* gesture_event) {
   // Filter for allowable touch actions first (eg. before the TouchEventQueue
   // can decide to send a touch cancel event).
   switch(gesture_event->type) {
     case WebInputEvent::GestureScrollBegin:
       DCHECK(!drop_scroll_gesture_events_);
       drop_scroll_gesture_events_ = ShouldSuppressScroll(*gesture_event);
@@ skipping 43 matching lines @@
       return drop_pinch_gesture_events_;
 
     case WebInputEvent::GesturePinchEnd:
       if (drop_pinch_gesture_events_) {
         drop_pinch_gesture_events_ = false;
         return true;
       }
       DCHECK(!drop_scroll_gesture_events_);
       break;
 
+    // If double tap is disabled, there's no reason for the tap delay.
+    case WebInputEvent::GestureTapUnconfirmed:
+      if (allowed_touch_action_ != TOUCH_ACTION_AUTO) {
+        gesture_event->type = WebInputEvent::GestureTap;
+        drop_current_tap_ending_event_ = true;
+      }
+      break;
+
+    case WebInputEvent::GestureTap:
+      if (drop_current_tap_ending_event_) {
+        drop_current_tap_ending_event_ = false;
+        return true;
+      }
+      break;
+
+    case WebInputEvent::GestureTapCancel:

[Rick Byers, 2014/02/18 20:40:16]

maybe combine this case with the above into a single case since they logically
represent the same scenario?

[tdresser, 2014/02/18 21:27:15]

Done.

+      if (drop_current_tap_ending_event_) {
+        drop_current_tap_ending_event_ = false;
+        return true;
+      }
+      break;
+
+    case WebInputEvent::GestureTapDown:
+      DCHECK(!drop_current_tap_ending_event_);
+      break;
+
+    case WebInputEvent::GestureDoubleTap:
+      if (allowed_touch_action_ != TOUCH_ACTION_AUTO)
+        return true;
+      break;
+
     default:
       // Gesture events unrelated to touch actions (panning/zooming) are left
       // alone.
       break;
   }
 
   return false;
 }
 
 bool TouchActionFilter::FilterScrollEndingGesture() {
@@ skipping 50 matching lines @@
   if (ta2 == TOUCH_ACTION_AUTO)
     return ta1;
 
   // Only the true flags are left - take their intersection.
   if (!(ta1 & ta2))
     return TOUCH_ACTION_NONE;
   return static_cast<TouchAction>(ta1 & ta2);
 }
 
 }