Plumb firing passive event listeners.

content/renderer/input/input_handler_manager.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/renderer/input/input_handler_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 18 matching lines @@
 
 InputEventAckState InputEventDispositionToAck(
     InputHandlerProxy::EventDisposition disposition) {
   switch (disposition) {
     case InputHandlerProxy::DID_HANDLE:
       return INPUT_EVENT_ACK_STATE_CONSUMED;
     case InputHandlerProxy::DID_NOT_HANDLE:
       return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
     case InputHandlerProxy::DROP_EVENT:
       return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
+    case InputHandlerProxy::NON_BLOCKING:
+      return INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING;
   }
   NOTREACHED();
   return INPUT_EVENT_ACK_STATE_UNKNOWN;
 }
 
 } // namespace
 
 InputHandlerManager::InputHandlerManager(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     InputHandlerManagerClient* client,
     scheduler::RendererScheduler* renderer_scheduler)
     : task_runner_(task_runner),
       client_(client),
       renderer_scheduler_(renderer_scheduler) {
   DCHECK(client_);
   client_->SetBoundHandler(base::Bind(&InputHandlerManager::HandleInputEvent,
                                       base::Unretained(this)));
 }
 
 InputHandlerManager::~InputHandlerManager() {
   client_->SetBoundHandler(InputHandlerManagerClient::Handler());
 }
 
 void InputHandlerManager::AddInputHandler(
     int routing_id,
     const base::WeakPtr<cc::InputHandler>& input_handler,
     const base::WeakPtr<RenderViewImpl>& render_view_impl,
-    bool enable_smooth_scrolling) {
+    bool enable_smooth_scrolling,
+    bool enable_wheel_gestures) {
   if (task_runner_->BelongsToCurrentThread()) {
-    AddInputHandlerOnCompositorThread(routing_id,
-                                      base::ThreadTaskRunnerHandle::Get(),
-                                      input_handler, render_view_impl,
-                                      enable_smooth_scrolling);
+    AddInputHandlerOnCompositorThread(
+        routing_id, base::ThreadTaskRunnerHandle::Get(), input_handler,
+        render_view_impl, enable_smooth_scrolling, enable_wheel_gestures);
   } else {
     task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&InputHandlerManager::AddInputHandlerOnCompositorThread,
                    base::Unretained(this), routing_id,
                    base::ThreadTaskRunnerHandle::Get(), input_handler,
-                   render_view_impl,
-                   enable_smooth_scrolling));
+                   render_view_impl, enable_smooth_scrolling,
+                   enable_wheel_gestures));
   }
 }
 
 void InputHandlerManager::AddInputHandlerOnCompositorThread(
     int routing_id,
     const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner,
     const base::WeakPtr<cc::InputHandler>& input_handler,
     const base::WeakPtr<RenderViewImpl>& render_view_impl,
-    bool enable_smooth_scrolling) {
+    bool enable_smooth_scrolling,
+    bool enable_wheel_gestures) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // The handler could be gone by this point if the compositor has shut down.
   if (!input_handler)
     return;
 
   // The same handler may be registered for a route multiple times.
   if (input_handlers_.count(routing_id) != 0)
     return;
 
   TRACE_EVENT1("input",
       "InputHandlerManager::AddInputHandlerOnCompositorThread",
       "result", "AddingRoute");
   scoped_ptr<InputHandlerWrapper> wrapper(new InputHandlerWrapper(
       this, routing_id, main_task_runner, input_handler, render_view_impl,
-      enable_smooth_scrolling));
+      enable_smooth_scrolling, enable_wheel_gestures));
   client_->DidAddInputHandler(routing_id, wrapper->input_handler_proxy());
   input_handlers_.add(routing_id, std::move(wrapper));
 }
 
 void InputHandlerManager::RemoveInputHandler(int routing_id) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(input_handlers_.contains(routing_id));
 
   TRACE_EVENT0("input", "InputHandlerManager::RemoveInputHandler");
 
@@ skipping 19 matching lines @@
   auto it = input_handlers_.find(routing_id);
   if (it == input_handlers_.end())
     return;
 
   InputHandlerProxy* proxy = it->second->input_handler_proxy();
   DCHECK(proxy->scroll_elasticity_controller());
   proxy->scroll_elasticity_controller()->ObserveWheelEventAndResult(
       wheel_event, scroll_result);
 }
 
+void InputHandlerManager::NonBlockingInputEventHandledOnMainThread(
+    int routing_id,
+    blink::WebInputEvent::Type type) {
+  task_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(
+          &InputHandlerManager::NonBlockingInputEventHandledOnCompositorThread,
+          base::Unretained(this), routing_id, type));
+}
+
+void InputHandlerManager::NonBlockingInputEventHandledOnCompositorThread(
+    int routing_id,
+    blink::WebInputEvent::Type handled_type) {
+  DCHECK(task_runner_->BelongsToCurrentThread());
+  auto it = input_handlers_.find(routing_id);
+  if (it == input_handlers_.end())
+    return;
+
+  client_->NonBlockingInputEventHandled(routing_id, handled_type);
+}
+
 InputEventAckState InputHandlerManager::HandleInputEvent(
     int routing_id,
     const WebInputEvent* input_event,
     ui::LatencyInfo* latency_info) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   TRACE_EVENT1("input,benchmark", "InputHandlerManager::HandleInputEvent",
                  "type", WebInputEventTraits::GetName(input_event->type));
 
   auto it = input_handlers_.find(routing_id);
   if (it == input_handlers_.end()) {
@@ skipping 32 matching lines @@
 
 void InputHandlerManager::DidStopFlinging(int routing_id) {
   client_->DidStopFlinging(routing_id);
 }
 
 void InputHandlerManager::DidAnimateForInput() {
   renderer_scheduler_->DidAnimateForInputOnCompositorThread();
 }
 
 }  // namespace content