Plumb firing passive event listeners.

ui/events/blink/input_handler_proxy.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 "ui/events/blink/input_handler_proxy.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 17 matching lines @@
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 using blink::WebMouseEvent;
 using blink::WebMouseWheelEvent;
 using blink::WebPoint;
 using blink::WebTouchEvent;
 using blink::WebTouchPoint;
 
 namespace {
 
+const int32_t kEventDispositionUndefined = -1;
+
 // Maximum time between a fling event's timestamp and the first |Animate| call
 // for the fling curve to use the fling timestamp as the initial animation time.
 // Two frames allows a minor delay between event creation and the first animate.
 const double kMaxSecondsFromFlingTimestampToFirstAnimate = 2. / 60.;
 
 // Threshold for determining whether a fling scroll delta should have caused the
 // client to scroll.
 const float kScrollEpsilon = 0.1f;
 
 // Minimum fling velocity required for the active fling and new fling for the
@@ skipping 166 matching lines @@
 #ifndef NDEBUG
       expect_scroll_update_end_(false),
 #endif
       gesture_scroll_on_impl_thread_(false),
       gesture_pinch_on_impl_thread_(false),
       fling_may_be_active_on_main_thread_(false),
       disallow_horizontal_fling_scroll_(false),
       disallow_vertical_fling_scroll_(false),
       has_fling_animation_started_(false),
       smooth_scroll_enabled_(false),
-      uma_latency_reporting_enabled_(base::TimeTicks::IsHighResolution()) {
+      uma_latency_reporting_enabled_(base::TimeTicks::IsHighResolution()),
+      use_gesture_events_for_mouse_wheel_(true),
+      touch_start_result_(kEventDispositionUndefined) {
   DCHECK(client);
   input_handler_->BindToClient(this);
   cc::ScrollElasticityHelper* scroll_elasticity_helper =
       input_handler_->CreateScrollElasticityHelper();
   if (scroll_elasticity_helper) {
     scroll_elasticity_controller_.reset(
         new InputScrollElasticityController(scroll_elasticity_helper));
   }
 }
 
@@ skipping 95 matching lines @@
     case WebInputEvent::GestureFlingCancel:
       if (CancelCurrentFling())
         return DID_HANDLE;
       else if (!fling_may_be_active_on_main_thread_)
         return DROP_EVENT;
       return DID_NOT_HANDLE;
 
     case WebInputEvent::TouchStart:
       return HandleTouchStart(static_cast<const WebTouchEvent&>(event));
 
+    case WebInputEvent::TouchMove:
+      return HandleTouchMove(static_cast<const WebTouchEvent&>(event));
+
+    case WebInputEvent::TouchEnd:
+      return HandleTouchEnd(static_cast<const WebTouchEvent&>(event));
+
     case WebInputEvent::MouseMove: {
       const WebMouseEvent& mouse_event =
           static_cast<const WebMouseEvent&>(event);
       // TODO(tony): Ignore when mouse buttons are down?
       // TODO(davemoore): This should never happen, but bug #326635 showed some
       // surprising crashes.
       CHECK(input_handler_);
       input_handler_->MouseMoveAt(gfx::Point(mouse_event.x, mouse_event.y));
       return DID_NOT_HANDLE;
     }
@@ skipping 63 matching lines @@
 #if defined(OS_MACOSX)
   // Mac does not smooth scroll wheel events (crbug.com/574283).
   return false;
 #else
   return smooth_scroll_enabled_ && !event.hasPreciseScrollingDeltas;
 #endif
 }
 
 InputHandlerProxy::EventDisposition InputHandlerProxy::HandleMouseWheel(
     const WebMouseWheelEvent& wheel_event) {
+  if (use_gesture_events_for_mouse_wheel_) {
+    cc::EventListenerProperties properties =
+        input_handler_->GetEventListenerProperties(
+            cc::EventListenerClass::kMouseWheel);
+    switch (properties) {
+      case cc::EventListenerProperties::kPassive:
+        return NON_BLOCKING;
+      case cc::EventListenerProperties::kBlockingAndPassive:
+      case cc::EventListenerProperties::kBlocking:
+        return DID_NOT_HANDLE;
+      case cc::EventListenerProperties::kNone:
+        return DROP_EVENT;
+      default:
+        NOTREACHED();
+        return DROP_EVENT;
+    }
+  }
+  return ScrollByMouseWheel(wheel_event);
+}
+
+InputHandlerProxy::EventDisposition InputHandlerProxy::ScrollByMouseWheel(
+    const WebMouseWheelEvent& wheel_event) {
   InputHandlerProxy::EventDisposition result = DID_NOT_HANDLE;
   cc::InputHandlerScrollResult scroll_result;
 
   // TODO(ccameron): The rail information should be pushed down into
   // InputHandler.
   gfx::Vector2dF scroll_delta(
       wheel_event.railsMode != WebInputEvent::RailsModeVertical
           ? -wheel_event.deltaX
           : 0,
       wheel_event.railsMode != WebInputEvent::RailsModeHorizontal
@@ skipping 280 matching lines @@
         return DID_NOT_HANDLE;
       }
       return DROP_EVENT;
     }
   }
   return DID_NOT_HANDLE;
 }
 
 InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchStart(
     const blink::WebTouchEvent& touch_event) {
-  for (size_t i = 0; i < touch_event.touchesLength; ++i) {
-    if (touch_event.touches[i].state != WebTouchPoint::StatePressed)
+  EventDisposition result = DROP_EVENT;
+  size_t touch_index = 0;
+  for (; touch_index < touch_event.touchesLength; ++touch_index) {
+    if (touch_event.touches[touch_index].state != WebTouchPoint::StatePressed)
       continue;
     if (input_handler_->DoTouchEventsBlockScrollAt(
-            gfx::Point(touch_event.touches[i].position.x,
-                       touch_event.touches[i].position.y))) {
-      // TODO(rbyers): We should consider still sending the touch events to
-      // main asynchronously (crbug.com/455539).
-      return DID_NOT_HANDLE;
+            gfx::Point(touch_event.touches[touch_index].position.x,
+                       touch_event.touches[touch_index].position.y))) {
+      result = DID_NOT_HANDLE;
+      break;
     }
   }
-  return DROP_EVENT;
+
+  // If |touch_index| has incremented to the length; it wasn't processed.
+  if (touch_index == touch_event.touchesLength) {

[tdresser, 2016/02/10 19:37:17]

Would it be more straight forward to just check if |result == DROP_EVENT|?

[dtapuska, 2016/02/10 22:05:22]

Done.

+    switch (input_handler_->GetEventListenerProperties(
+        cc::EventListenerClass::kTouch)) {
+      case cc::EventListenerProperties::kPassive:
+        result = NON_BLOCKING;
+        break;
+      case cc::EventListenerProperties::kBlocking:
+        // The touch area rects above already have checked whether it hits
+        // a blocking region. Since it does not the event can be dropped.
+        result = DROP_EVENT;
+        break;
+      case cc::EventListenerProperties::kBlockingAndPassive:
+        // There is at least one passive listener that needs to possibly
+        // be notified so it can't be dropped.
+        result = NON_BLOCKING;
+        break;
+      case cc::EventListenerProperties::kNone:
+        result = DROP_EVENT;
+        break;
+      default:
+        NOTREACHED();
+        result = DROP_EVENT;
+        break;
+    }
+  }
+
+  // Update |touch_start_result_| if |result| generates a higher level
+  // of blocking.

[tdresser, 2016/02/10 19:37:17]

This is a bit hard to read - maybe add a comment with the list of
EventDispositions sorted by blocking'ness?

[dtapuska, 2016/02/10 22:05:22]

Done.

+  if (touch_start_result_ == kEventDispositionUndefined ||
+      result == DID_NOT_HANDLE ||
+      (result == NON_BLOCKING && touch_start_result_ == DROP_EVENT))
+    touch_start_result_ = result;

[tdresser, 2016/02/10 19:37:17]

Is this also correct?

if (touch_start_result_ == kEventDispositionUndefined ||
    touch_start_result_ == DROP_EVENT ||
    result == DID_NOT_HANDLE) {
     touch_start_result_ = result;
}

[dtapuska, 2016/02/10 22:05:22]

Done.

+
+  return result;
+}
+
+InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchMove(
+    const blink::WebTouchEvent& touch_event) {
+  if (touch_start_result_ != kEventDispositionUndefined)
+    return static_cast<EventDisposition>(touch_start_result_);
+  return DID_NOT_HANDLE;
+}
+
+InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchEnd(
+    const blink::WebTouchEvent& touch_event) {
+  if (touch_event.touchesLength == 1)
+    touch_start_result_ = kEventDispositionUndefined;
+  return DID_NOT_HANDLE;

[tdresser, 2016/02/10 19:37:17]

Is this DID_NOT_HANDLE correct?

[dtapuska, 2016/02/10 22:05:22]

Yes; HandleTouchEnd was in the default block before; so it was always sent to
the main thread; look at the default value on line 371.

[tdresser, 2016/02/11 14:24:01]

Acknowledged.

 }
 
 bool InputHandlerProxy::FilterInputEventForFlingBoosting(
     const WebInputEvent& event) {
   if (!WebInputEvent::isGestureEventType(event.type))
     return false;
 
   if (!fling_curve_) {
     DCHECK(!deferred_fling_cancel_time_seconds_);
     return false;
@@ skipping 323 matching lines @@
   // flings always go through the normal InputHandler.
   if (synchronous_input_handler_ &&
       input_handler_->IsCurrentlyScrollingInnerViewport())
     synchronous_input_handler_->SetNeedsSynchronousAnimateInput();
   else
     input_handler_->SetNeedsAnimateInput();
 }
 
 bool InputHandlerProxy::TouchpadFlingScroll(
     const WebFloatSize& increment) {
-  WebMouseWheelEvent synthetic_wheel;
-  synthetic_wheel.type = WebInputEvent::MouseWheel;
-  synthetic_wheel.timeStampSeconds = InSecondsF(base::TimeTicks::Now());
-  synthetic_wheel.deltaX = increment.width;
-  synthetic_wheel.deltaY = increment.height;
-  synthetic_wheel.hasPreciseScrollingDeltas = true;
-  synthetic_wheel.x = fling_parameters_.point.x;
-  synthetic_wheel.y = fling_parameters_.point.y;
-  synthetic_wheel.globalX = fling_parameters_.globalPoint.x;
-  synthetic_wheel.globalY = fling_parameters_.globalPoint.y;
-  synthetic_wheel.modifiers = fling_parameters_.modifiers;
+  InputHandlerProxy::EventDisposition disposition;
+  cc::EventListenerProperties properties =
+      input_handler_->GetEventListenerProperties(
+          cc::EventListenerClass::kMouseWheel);
+  switch (properties) {
+    case cc::EventListenerProperties::kPassive:
+      disposition = NON_BLOCKING;
+      break;
+    case cc::EventListenerProperties::kBlocking:
+      disposition = DID_NOT_HANDLE;
+      break;
+    case cc::EventListenerProperties::kNone: {
+      WebMouseWheelEvent synthetic_wheel;
+      synthetic_wheel.type = WebInputEvent::MouseWheel;
+      synthetic_wheel.timeStampSeconds = InSecondsF(base::TimeTicks::Now());
+      synthetic_wheel.deltaX = increment.width;
+      synthetic_wheel.deltaY = increment.height;
+      synthetic_wheel.hasPreciseScrollingDeltas = true;
+      synthetic_wheel.x = fling_parameters_.point.x;
+      synthetic_wheel.y = fling_parameters_.point.y;
+      synthetic_wheel.globalX = fling_parameters_.globalPoint.x;
+      synthetic_wheel.globalY = fling_parameters_.globalPoint.y;
+      synthetic_wheel.modifiers = fling_parameters_.modifiers;
 
-  InputHandlerProxy::EventDisposition disposition =
-      HandleInputEvent(synthetic_wheel);
+      disposition = ScrollByMouseWheel(synthetic_wheel);
+      break;
+    }
+    default:
+      NOTREACHED();
+      return false;
+  }
+
   switch (disposition) {
     case DID_HANDLE:
       return true;
     case DROP_EVENT:
       break;
+    case NON_BLOCKING:
+    // TODO(dtapuska): Process the fling on the compositor thread
+    // but post the events to the main thread; for now just pass it to the
+    // main thread.
     case DID_NOT_HANDLE:
       TRACE_EVENT_INSTANT0("input",
                            "InputHandlerProxy::scrollBy::AbortFling",
                            TRACE_EVENT_SCOPE_THREAD);
       // If we got a DID_NOT_HANDLE, that means we need to deliver wheels on the
       // main thread. In this case we need to schedule a commit and transfer the
       // fling curve over to the main thread and run the rest of the wheels from
       // there. This can happen when flinging a page that contains a scrollable
       // subarea that we can't scroll on the thread if the fling starts outside
       // the subarea but then is flung "under" the pointer.
@@ skipping 64 matching lines @@
   // trigger a scroll, e.g., with a trivial time delta between fling updates.
   // Return true in this case to prevent early fling termination.
   if (std::abs(clipped_increment.width) < kScrollEpsilon &&
       std::abs(clipped_increment.height) < kScrollEpsilon)
     return true;
 
   return did_scroll;
 }
 
 }  // namespace ui