[Android] Reland "Provide unhandled tap event notifications"

Allow notifications of unhandled taps via the GestureStateListener. This change
makes GestureTap events blocking, but there are several use-cases for which this
will be necessary, e.g., WebView and contextual search.

This was landed in r26143 and reverted in r261470 due to to a failure in
TouchEditableImplAuraTest.TouchCursorInTextfieldTest. The test has been fixed
and reviewed previously in crrev.com/218633008.

BUG=355154
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/256213002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266732 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/android/content_view_core_impl.cc

@@ -599,6 +599,12 @@ void ContentViewCoreImpl::OnGestureEventAck(const blink::WebGestureEvent& event,
     case WebInputEvent::GesturePinchEnd:
       Java_ContentViewCore_onPinchEndEventAck(env, j_obj.obj());
       break;
+    case WebInputEvent::GestureTap:
+      if (ack_result != INPUT_EVENT_ACK_STATE_CONSUMED) {
+        Java_ContentViewCore_onTapEventNotConsumed(
+            env, j_obj.obj(), event.x * dpi_scale(), event.y * dpi_scale());
+      }
+      break;
     case WebInputEvent::GestureDoubleTap:
       Java_ContentViewCore_onDoubleTapEventAck(env, j_obj.obj());
       break;

content/browser/renderer_host/input/input_router_impl_unittest.cc

@@ -1279,10 +1279,17 @@ TEST_F(InputRouterImplTest, DoubleTapGestureDependsOnFirstTap) {
   EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
 
   // The GestureTapUnconfirmed is converted into a tap, as the touch action is
-  // auto.
+  // none.
   SimulateGestureEvent(WebInputEvent::GestureTapUnconfirmed,
                        WebGestureEvent::Touchscreen);
   EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
+  // This test will become invalid if GestureTap stops requiring an ack.
+  ASSERT_FALSE(WebInputEventTraits::IgnoresAckDisposition(
+      GetEventWithType(WebInputEvent::GestureTap)));
+  EXPECT_EQ(2, client_->in_flight_event_count());
+  SendInputEventACK(WebInputEvent::GestureTap,
+                    INPUT_EVENT_ACK_STATE_CONSUMED);
+  EXPECT_EQ(1, client_->in_flight_event_count());
 
   // This tap gesture is dropped, since the GestureTapUnconfirmed was turned
   // into a tap.
@@ -1304,8 +1311,10 @@ TEST_F(InputRouterImplTest, DoubleTapGestureDependsOnFirstTap) {
   SimulateGestureEvent(WebInputEvent::GestureDoubleTap,
                        WebGestureEvent::Touchscreen);
   // This test will become invalid if GestureDoubleTap stops requiring an ack.
-  DCHECK(!WebInputEventTraits::IgnoresAckDisposition(
-             GetEventWithType(WebInputEvent::GestureDoubleTap)));
+  ASSERT_FALSE(WebInputEventTraits::IgnoresAckDisposition(
+      GetEventWithType(WebInputEvent::GestureDoubleTap)));
+  EXPECT_EQ(1, client_->in_flight_event_count());
+  SendInputEventACK(WebInputEvent::GestureTap, INPUT_EVENT_ACK_STATE_CONSUMED);
   EXPECT_EQ(0, client_->in_flight_event_count());
 }
 

content/browser/web_contents/touch_editable_impl_aura_browsertest.cc

@@ -369,9 +369,10 @@ IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest,
   // Tap textfield
   touch_editable->Reset();
   generator.GestureTapAt(gfx::Point(bounds.x() + 50, bounds.y() + 40));
-  // Tap Down and Tap acks are sent synchronously.
-  touch_editable->WaitForSelectionChangeCallback();
+  // Tap Down acks are sent synchronously, while Tap acks are asynchronous.
   touch_editable->Reset();
+  touch_editable->WaitForGestureAck();
+  touch_editable->WaitForSelectionChangeCallback();
 
   // Check if cursor handle is showing.
   EXPECT_NE(ui::TEXT_INPUT_TYPE_NONE, GetTextInputType(touch_editable));

content/common/input/web_input_event_traits.cc

@@ -344,7 +344,6 @@ bool WebInputEventTraits::IgnoresAckDisposition(const WebInputEvent& event) {
     case WebInputEvent::GestureScrollBegin:
     case WebInputEvent::GestureScrollEnd:
     case WebInputEvent::GestureShowPress:
-    case WebInputEvent::GestureTap:
     case WebInputEvent::GestureTapUnconfirmed:
     case WebInputEvent::GestureTapDown:
     case WebInputEvent::GestureTapCancel:

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

@@ -1304,6 +1304,15 @@ public class ContentViewCore
         updateGestureStateListener(GestureEventType.PINCH_END);
     }
 
+    @SuppressWarnings("unused")
+    @CalledByNative
+    private void onTapEventNotConsumed(int x, int y) {
+        for (mGestureStateListenersIterator.rewind();
+                mGestureStateListenersIterator.hasNext();) {
+            mGestureStateListenersIterator.next().onUnhandledTapEvent(x, y);
+        }
+    }
+
     @SuppressWarnings("unused")
     @CalledByNative
     private void onDoubleTapEventAck() {

content/public/android/java/src/org/chromium/content_public/browser/GestureStateListener.java

@@ -61,4 +61,9 @@ public class GestureStateListener {
      * Called when the scroll offsets or extents may have changed.
      */
     public void onScrollOffsetOrExtentChanged(int scrollOffsetY, int scrollExtentY) {}
+
+    /*
+     * Called when a tap event was not handled by the renderer.
+     */
+    public void onUnhandledTapEvent(int x, int y) {}
 }