Mark touchcancel events as uncancelable

content/browser/renderer_host/input/input_router_impl.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/input_router_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/renderer_host/input/gesture_event_queue.h"
 #include "content/browser/renderer_host/input/input_ack_handler.h"
 #include "content/browser/renderer_host/input/input_router_client.h"
 #include "content/browser/renderer_host/input/touch_event_queue.h"
 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controller.h"
-#include "content/browser/renderer_host/input/web_touch_event_traits.h"
 #include "content/browser/renderer_host/overscroll_controller.h"
 #include "content/common/content_constants_internal.h"
 #include "content/common/edit_command.h"
 #include "content/common/input/touch_action.h"
+#include "content/common/input/web_touch_event_traits.h"
 #include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
 #include "content/port/common/input_event_ack_state.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
 #include "ipc/ipc_sender.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 408 matching lines @@
   }
 
   if (OfferToOverscrollController(input_event, latency_info))
     return;
 
   if (OfferToClient(input_event, latency_info))
     return;
 
   OfferToRenderer(input_event, latency_info, is_keyboard_shortcut);
 
+  // Touch events should always indicate in the event whether they are
+  // cancelable (respect ACK disposition) or not.
+  bool ignoresAck =
+      WebInputEventTraits::IgnoresAckDisposition(input_event.type);
+  if (WebInputEvent::isTouchEventType(input_event.type)) {
+    DCHECK(!ignoresAck ==
+        static_cast<const blink::WebTouchEvent&>(input_event).cancelable);
+  }
+
   // If we don't care about the ack disposition, send the ack immediately.
-  if (WebInputEventTraits::IgnoresAckDisposition(input_event.type)) {
+  if (ignoresAck) {
     ProcessInputEventAck(input_event.type,

[jdduke (slow), 2014/04/23 21:55:47]

Let's put the DCHECK inside this block (for the touch), then it can just be

if (WebInputEvent::isTouchEventType(input_event.type)) {
  DCHECK(!static_cast<const blink::WebTouchEvent&>(input_event).cancelable);
}

[Rick Byers, 2014/04/23 23:15:35]

But I also want to DCHECK the other case as well - that events that don't ignore
ACK are marked cancelable=true.  I could do that with two DCHECKs if you think
that would be clearer.

[jdduke (slow), 2014/04/23 23:29:49]

Well, I was thinking of the impending case where other types will in fact be
cancelable.  I guess I should just update this class appropriately then?

                          INPUT_EVENT_ACK_STATE_IGNORED,
                          latency_info,
                          IGNORING_DISPOSITION);
   }
 }
 
 bool InputRouterImpl::OfferToOverscrollController(
     const WebInputEvent& input_event,
     const ui::LatencyInfo& latency_info) {
   OverscrollController* controller = client_->GetOverscrollController();
@@ skipping 387 matching lines @@
          select_range_pending_ ||
          move_caret_pending_;
 }
 
 bool InputRouterImpl::IsInOverscrollGesture() const {
   OverscrollController* controller = client_->GetOverscrollController();
   return controller && controller->overscroll_mode() != OVERSCROLL_NONE;
 }
 
 }  // namespace content