Plumb firing passive event listeners.

content/renderer/input/render_widget_input_handler.cc

 // Copyright 2015 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/render_widget_input_handler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 113 matching lines @@
         event.type, latency_info.timestamps_of_coalesced_events()[i], now);
   }
 }
 
 void LogPassiveLatency(int64_t latency) {
   UMA_HISTOGRAM_CUSTOM_COUNTS("Event.PassiveListeners.Latency", latency, 1,
                               10000000, 100);
 }
 
 void LogPassiveEventListenersUma(WebInputEventResult result,
-                                 bool passive,
+                                 bool non_blocking,
                                  bool cancelable,
                                  double event_timestamp,
                                  const ui::LatencyInfo& latency_info) {
   enum {
     PASSIVE_LISTENER_UMA_ENUM_PASSIVE,
     PASSIVE_LISTENER_UMA_ENUM_UNCANCELABLE,
     PASSIVE_LISTENER_UMA_ENUM_SUPPRESSED,
     PASSIVE_LISTENER_UMA_ENUM_CANCELABLE,
     PASSIVE_LISTENER_UMA_ENUM_CANCELABLE_AND_CANCELED,
     PASSIVE_LISTENER_UMA_ENUM_COUNT
   };
 
   int enum_value;
-  if (passive)
+  if (non_blocking)
     enum_value = PASSIVE_LISTENER_UMA_ENUM_PASSIVE;
   else if (!cancelable)
     enum_value = PASSIVE_LISTENER_UMA_ENUM_UNCANCELABLE;
   else if (result == WebInputEventResult::HandledApplication)
     enum_value = PASSIVE_LISTENER_UMA_ENUM_CANCELABLE_AND_CANCELED;
   else if (result == WebInputEventResult::HandledSuppressed)
     enum_value = PASSIVE_LISTENER_UMA_ENUM_SUPPRESSED;
   else
     enum_value = PASSIVE_LISTENER_UMA_ENUM_CANCELABLE;
 
@@ skipping 25 matching lines @@
       ignore_ack_for_mouse_move_from_debugger_(false) {
   DCHECK(delegate);
   DCHECK(widget);
   delegate->SetInputHandler(this);
 }
 
 RenderWidgetInputHandler::~RenderWidgetInputHandler() {}
 
 void RenderWidgetInputHandler::HandleInputEvent(
     const WebInputEvent& input_event,
-    const ui::LatencyInfo& latency_info) {
-  // TODO(dtapuska): Passive support not implemented yet crbug.com/489802
-  bool passive = false;
+    const ui::LatencyInfo& latency_info,
+    InputEventDispatchType dispatch_type) {
   base::AutoReset<bool> handling_input_event_resetter(&handling_input_event_,
                                                       true);
   base::AutoReset<WebInputEvent::Type> handling_event_type_resetter(
       &handling_event_type_, input_event.type);
 
   // Calls into |didOverscroll()| while handling this event will populate
   // |event_overscroll|, which in turn will be bundled with the event ack.
   scoped_ptr<DidOverscrollParams> event_overscroll;
   base::AutoReset<scoped_ptr<DidOverscrollParams>*>
       handling_event_overscroll_resetter(&handling_event_overscroll_,
@@ skipping 100 matching lines @@
 
   WebInputEventResult processed = prevent_default
                                       ? WebInputEventResult::HandledSuppressed
                                       : WebInputEventResult::NotHandled;
   if (input_event.type != WebInputEvent::Char || !suppress_next_char_events_) {
     suppress_next_char_events_ = false;
     if (processed == WebInputEventResult::NotHandled && widget_->webwidget())
       processed = widget_->webwidget()->handleInputEvent(input_event);
   }
 
+  bool non_blocking =
+      dispatch_type == InputEventDispatchType::DISPATCH_TYPE_NON_BLOCKING;
   // TODO(dtapuska): Use the input_event.timeStampSeconds as the start
   // ideally this should be when the event was sent by the compositor to the
   // renderer. crbug.com/565348
   if (input_event.type == WebInputEvent::TouchStart ||
       input_event.type == WebInputEvent::TouchMove ||
       input_event.type == WebInputEvent::TouchEnd) {
     LogPassiveEventListenersUma(
-        processed, passive,
+        processed, non_blocking,
         static_cast<const WebTouchEvent&>(input_event).cancelable,
         input_event.timeStampSeconds, latency_info);
   } else if (input_event.type == WebInputEvent::MouseWheel) {
-    LogPassiveEventListenersUma(processed, passive, !passive,
+    LogPassiveEventListenersUma(processed, non_blocking, !non_blocking,
                                 input_event.timeStampSeconds, latency_info);
   }
 
   // If this RawKeyDown event corresponds to a browser keyboard shortcut and
   // it's not processed by webkit, then we need to suppress the upcoming Char
   // events.
   bool is_keyboard_shortcut =
       input_event.type == WebInputEvent::RawKeyDown &&
       static_cast<const WebKeyboardEvent&>(input_event).isBrowserShortcut;
   if (processed == WebInputEventResult::NotHandled && is_keyboard_shortcut)
@@ skipping 16 matching lines @@
               gfx::ToFlooredPoint(touch_event.touches[i].position))) {
         ack_result = INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
         break;
       }
     }
   }
 
   // Send mouse wheel events and their disposition to the compositor thread, so
   // that they can be used to produce the elastic overscroll effect on Mac.
   if (input_event.type == WebInputEvent::MouseWheel) {
-    delegate_->ObserveWheelEventAndResult(
-        static_cast<const WebMouseWheelEvent&>(input_event),
-        event_overscroll ? event_overscroll->latest_overscroll_delta
-                         : gfx::Vector2dF(),
-        processed != WebInputEventResult::NotHandled);
+    const WebMouseWheelEvent& wheel_event =
+        static_cast<const WebMouseWheelEvent&>(input_event);
+    if (wheel_event.canScroll) {
+      delegate_->ObserveWheelEventAndResult(
+          wheel_event,
+          event_overscroll ? event_overscroll->latest_overscroll_delta
+                           : gfx::Vector2dF(),
+          processed != WebInputEventResult::NotHandled);
+    }
   }
 
   bool frame_pending =
       widget_->compositor() && widget_->compositor()->BeginMainFrameRequested();
 
   // If we don't have a fast and accurate Now(), we assume the input handlers
   // are heavy and rate limit them.
   bool rate_limiting_wanted = input_event.type == WebInputEvent::MouseMove ||
                               input_event.type == WebInputEvent::MouseWheel;
   if (rate_limiting_wanted && !start_time.is_null()) {
     base::TimeTicks end_time = base::TimeTicks::Now();
     total_input_handling_time_this_frame_ += (end_time - start_time);
     rate_limiting_wanted =
         total_input_handling_time_this_frame_.InMicroseconds() >
         kInputHandlingTimeThrottlingThresholdMicroseconds;
   }
 
   TRACE_EVENT_SYNTHETIC_DELAY_END("blink.HandleInputEvent");
 
   // Note that we can't use handling_event_type_ here since it will be overriden
   // by reentrant calls for events after the paused one.
   bool no_ack = ignore_ack_for_mouse_move_from_debugger_ &&
                 input_event.type == WebInputEvent::MouseMove;
-  if (WebInputEventTraits::WillReceiveAckFromRenderer(input_event) && !no_ack) {
+  if (non_blocking) {
+    // |non_blocking| means it was ack'd already by the InputHandlerProxy
+    // so let the delegate know the event has been handled.
+    delegate_->NonBlockingInputEventHandled(input_event.type);
+  } else if (WebInputEventTraits::WillReceiveAckFromRenderer(input_event) &&
+             !no_ack) {
     scoped_ptr<InputEventAck> response(new InputEventAck(
         input_event.type, ack_result, swap_latency_info,
         std::move(event_overscroll),
         WebInputEventTraits::GetUniqueTouchEventId(input_event)));
     if (rate_limiting_wanted && frame_pending && !widget_->is_hidden()) {
       // We want to rate limit the input events in this case, so we'll wait for
       // painting to finish before ACKing this message.
       TRACE_EVENT_INSTANT0(
           "renderer",
           "RenderWidgetInputHandler::OnHandleInputEvent ack throttled",
@@ skipping 108 matching lines @@
   if (pending_input_event_ack_) {
     TRACE_EVENT_ASYNC_END0("input",
                            "RenderWidgetInputHandler::ThrottledInputEventAck",
                            pending_input_event_ack_.get());
     delegate_->OnInputEventAck(std::move(pending_input_event_ack_));
   }
   total_input_handling_time_this_frame_ = base::TimeDelta();
 }
 
 }  // namespace content