Index: content/common/input/web_input_event_traits.cc |
diff --git a/content/common/input/web_input_event_traits.cc b/content/common/input/web_input_event_traits.cc |
index 7de816a1a6bc9645e7232f8fdbd8cc6a7d709019..df4513ea69ba0800389cb0c8d14c6a66f81aff22 100644 |
--- a/content/common/input/web_input_event_traits.cc |
+++ b/content/common/input/web_input_event_traits.cc |
@@ -334,28 +334,31 @@ void WebInputEventTraits::Coalesce(const WebInputEvent& event_to_coalesce, |
Apply(WebInputEventCoalesce(), event->type, event_to_coalesce, event); |
} |
-bool WebInputEventTraits::IgnoresAckDisposition( |
- blink::WebInputEvent::Type type) { |
- switch (type) { |
- case WebInputEvent::GestureTapDown: |
- case WebInputEvent::GestureShowPress: |
- case WebInputEvent::GestureTapCancel: |
- case WebInputEvent::GestureTap: |
- case WebInputEvent::GesturePinchBegin: |
- case WebInputEvent::GesturePinchEnd: |
- case WebInputEvent::GestureScrollBegin: |
- case WebInputEvent::GestureScrollEnd: |
- case WebInputEvent::TouchCancel: |
+bool WebInputEventTraits::IgnoresAckDisposition(const WebInputEvent& event) { |
+ switch (event.type) { |
case WebInputEvent::MouseDown: |
case WebInputEvent::MouseUp: |
case WebInputEvent::MouseEnter: |
case WebInputEvent::MouseLeave: |
case WebInputEvent::ContextMenu: |
+ case WebInputEvent::GestureScrollBegin: |
+ case WebInputEvent::GestureScrollEnd: |
+ case WebInputEvent::GestureShowPress: |
+ case WebInputEvent::GestureTap: |
+ case WebInputEvent::GestureTapUnconfirmed: |
+ case WebInputEvent::GestureTapDown: |
+ case WebInputEvent::GestureTapCancel: |
+ case WebInputEvent::GesturePinchBegin: |
+ case WebInputEvent::GesturePinchEnd: |
+ case WebInputEvent::TouchCancel: |
return true; |
+ case WebInputEvent::TouchStart: |
+ case WebInputEvent::TouchMove: |
+ case WebInputEvent::TouchEnd: |
+ return !static_cast<const WebTouchEvent&>(event).cancelable; |
default: |
- break; |
+ return false; |
} |
- return false; |
} |
} // namespace content |