Plumb firing passive event listeners.

content/renderer/input/input_event_filter.cc

Index: content/renderer/input/input_event_filter.cc
diff --git a/content/renderer/input/input_event_filter.cc b/content/renderer/input/input_event_filter.cc
index c85586272fd1a36742db5e8fda60b93802b6c9fe..a8a851847dfac8e40d542671c7620c37f92a78a7 100644
--- a/content/renderer/input/input_event_filter.cc
+++ b/content/renderer/input/input_event_filter.cc
@@ -69,6 +69,7 @@ void InputEventFilter::DidAddInputHandler(
 void InputEventFilter::DidRemoveInputHandler(int routing_id) {
   base::AutoLock locked(routes_lock_);
   routes_.erase(routing_id);
+  route_queues_.erase(routing_id);
 }
 
 void InputEventFilter::DidOverscroll(int routing_id,
@@ -86,6 +87,17 @@ void InputEventFilter::DidStopFlinging(int routing_id) {
   SendMessage(make_scoped_ptr(new InputHostMsg_DidStopFlinging(routing_id)));
 }
 
+void InputEventFilter::NonBlockingInputEventHandled(
+    int routing_id,
+    blink::WebInputEvent::Type type) {
+  DCHECK(target_task_runner_->BelongsToCurrentThread());
+  RouteQueueMap::iterator iter = route_queues_.find(routing_id);
+  if (iter == route_queues_.end() || !iter->second)
+    return;
+
+  iter->second->EventHandled(type);
+}
+
 void InputEventFilter::OnFilterAdded(IPC::Sender* sender) {
   io_task_runner_ = base::ThreadTaskRunnerHandle::Get();
   sender_ = sender;
@@ -151,9 +163,11 @@ void InputEventFilter::ForwardToHandler(const IPC::Message& message) {
     return;
   const WebInputEvent* event = base::get<0>(params);
   ui::LatencyInfo latency_info = base::get<1>(params);
+  bool passive = base::get<2>(params);
   DCHECK(event);
+  DCHECK(!passive);
 
-  const bool send_ack = WebInputEventTraits::WillReceiveAckFromRenderer(*event);
+  bool send_ack = WebInputEventTraits::WillReceiveAckFromRenderer(*event);

[tdresser, 2016/02/08 17:51:32]

Is making this mutable an improvement?

[dtapuska, 2016/02/09 19:40:11]

aelias asked for this change in previous review.

 
   // Intercept |DidOverscroll| notifications, bundling any triggered overscroll
   // response with the input event ack.
@@ -164,16 +178,25 @@ void InputEventFilter::ForwardToHandler(const IPC::Message& message) {
 
   InputEventAckState ack_state = handler_.Run(routing_id, event, &latency_info);
 
-  if (ack_state == INPUT_EVENT_ACK_STATE_NOT_CONSUMED) {
+  if (ack_state == INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING) {
+    DCHECK(!overscroll_params);
+    RouteQueueMap::iterator iter = route_queues_.find(routing_id);
+    if (iter == route_queues_.end()) {
+      route_queues_[routing_id].reset(
+          new NonBlockingEventQueue(routing_id, this));
+      iter = route_queues_.find(routing_id);

[tdresser, 2016/02/08 17:51:32]

Might as well avoid this unnecessary lookup by storing the queue in a local
variable.

[dtapuska, 2016/02/09 19:40:11]

Done.

+    }
+    iter->second->HandleEvent(event, latency_info);
+  } else if (ack_state == INPUT_EVENT_ACK_STATE_NOT_CONSUMED) {
     DCHECK(!overscroll_params);
     TRACE_EVENT_INSTANT0(
-        "input",
-        "InputEventFilter::ForwardToHandler::ForwardToMainListener",
+        "input", "InputEventFilter::ForwardToHandler::ForwardToMainListener",
         TRACE_EVENT_SCOPE_THREAD);
     IPC::Message new_msg =
-        InputMsg_HandleInputEvent(routing_id, event, latency_info);
+        InputMsg_HandleInputEvent(routing_id, event, latency_info,
+                                  InputEventDispatchType::DISPATCH_TYPE_NORMAL);
     main_task_runner_->PostTask(FROM_HERE, base::Bind(main_listener_, new_msg));
-    return;
+    send_ack = false;
   }
 
   if (!send_ack)
@@ -203,4 +226,16 @@ void InputEventFilter::SendMessageOnIOThread(scoped_ptr<IPC::Message> message) {
   sender_->Send(message.release());
 }
 
+void InputEventFilter::SendNonBlockingEvent(int routing_id,
+                                            const blink::WebInputEvent* event,
+                                            const ui::LatencyInfo& latency) {
+  TRACE_EVENT_INSTANT0(
+      "input", "InputEventFilter::ForwardToHandler::ForwardToMainListener",

[tdresser, 2016/02/08 17:51:32]

Update trace name.

[dtapuska, 2016/02/09 19:40:11]

Done.

+      TRACE_EVENT_SCOPE_THREAD);
+  IPC::Message new_msg = InputMsg_HandleInputEvent(
+      routing_id, event, latency,
+      InputEventDispatchType::DISPATCH_TYPE_NON_BLOCKING);
+  main_task_runner_->PostTask(FROM_HERE, base::Bind(main_listener_, new_msg));
+}
+
 }  // namespace content