Articulate the cancel behavior in the WebTouchEvent.

content/renderer/input/main_thread_event_queue.cc

 // Copyright 2016 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/renderer/input/main_thread_event_queue.h"
 
 namespace content {
 
 MainThreadEventQueue::MainThreadEventQueue(int routing_id,
                                            MainThreadEventQueueClient* client)
@@ skipping 30 matching lines @@
                                        dispatch_type);
       } else {
         // If there is nothing in the event queue and the event is
         // blocking pass the |original_dispatch_type| to avoid
         // having the main thread call us back as an optimization.
         client_->SendEventToMainThread(routing_id_, event, latency,
                                        original_dispatch_type);
       }
     }
   } else if (blink::WebInputEvent::isTouchEventType(event->type)) {
+    PendingTouchEvent new_touch_event =

[dtapuska, 2016/04/18 20:10:37]

err this is a poorly name variable. I thought I changed it before uploading.

+        PendingTouchEvent(*static_cast<const blink::WebTouchEvent*>(event),
+                          latency, dispatch_type);
+    if (non_blocking) {
+      new_touch_event.event.dispatchType =
+          blink::WebInputEvent::ListenersNonBlockingPassive;

[tdresser, 2016/04/18 20:22:40]

Hrm, this is a bit confusing, as a non-blocking event with a blocking event
listener will now have the ListenersNonBlockingPassive DispatchType...

+    }
     if (touch_events_.state() == WebInputEventQueueState::ITEM_PENDING) {
-      touch_events_.Queue(
-          PendingTouchEvent(*static_cast<const blink::WebTouchEvent*>(event),
-                            latency, dispatch_type));
+      touch_events_.Queue(new_touch_event);
     } else {
       if (non_blocking) {
         touch_events_.set_state(WebInputEventQueueState::ITEM_PENDING);
-        client_->SendEventToMainThread(routing_id_, event, latency,
-                                       dispatch_type);
+        client_->SendEventToMainThread(routing_id_, &new_touch_event.event,
+                                       latency, dispatch_type);
       } else {
         // If there is nothing in the event queue and the event is
         // blocking pass the |original_dispatch_type| to avoid
         // having the main thread call us back as an optimization.
-        client_->SendEventToMainThread(routing_id_, event, latency,
-                                       original_dispatch_type);
+        client_->SendEventToMainThread(routing_id_, &new_touch_event.event,
+                                       latency, original_dispatch_type);
       }
     }
   } else {
     client_->SendEventToMainThread(routing_id_, event, latency,
                                    original_dispatch_type);
   }
 
   // send an ack when we are non-blocking.
   return non_blocking;
 }
@@ skipping 14 matching lines @@
                                      event->type);
     } else {
       touch_events_.set_state(WebInputEventQueueState::ITEM_NOT_PENDING);
     }
   } else {
     NOTREACHED() << "Invalid passive event type";
   }
 }
 
 }  // namespace content