summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/browser/android/content_view_core_impl.cc10
-rw-r--r--content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java4
-rw-r--r--content/public/android/java/src/org/chromium/content_public/browser/GestureStateListener.java5
3 files changed, 11 insertions, 8 deletions
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 60d1b85..8fcfba9 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -591,10 +591,12 @@ void ContentViewCoreImpl::OnGestureEventAck(const blink::WebGestureEvent& event,
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());
- }
+ Java_ContentViewCore_onSingleTapEventAck(
+ env,
+ j_obj.obj(),
+ ack_result == INPUT_EVENT_ACK_STATE_CONSUMED,
+ event.x * dpi_scale(),
+ event.y * dpi_scale());
break;
case WebInputEvent::GestureDoubleTap:
Java_ContentViewCore_onDoubleTapEventAck(env, j_obj.obj());
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 6fbe929..1324222 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -1187,10 +1187,10 @@ public class ContentViewCore
@SuppressWarnings("unused")
@CalledByNative
- private void onTapEventNotConsumed(int x, int y) {
+ private void onSingleTapEventAck(boolean consumed, int x, int y) {
for (mGestureStateListenersIterator.rewind();
mGestureStateListenersIterator.hasNext();) {
- mGestureStateListenersIterator.next().onUnhandledTapEvent(x, y);
+ mGestureStateListenersIterator.next().onSingleTap(consumed, x, y);
}
}
diff --git a/content/public/android/java/src/org/chromium/content_public/browser/GestureStateListener.java b/content/public/android/java/src/org/chromium/content_public/browser/GestureStateListener.java
index 1597160..caac14f 100644
--- a/content/public/android/java/src/org/chromium/content_public/browser/GestureStateListener.java
+++ b/content/public/android/java/src/org/chromium/content_public/browser/GestureStateListener.java
@@ -63,7 +63,8 @@ public class GestureStateListener {
public void onScrollOffsetOrExtentChanged(int scrollOffsetY, int scrollExtentY) {}
/*
- * Called when a tap event was not handled by the renderer.
+ * Called after a single-tap gesture event was dispatched to the renderer,
+ * indicating whether or not the gesture was consumed.
*/
- public void onUnhandledTapEvent(int x, int y) {}
+ public void onSingleTap(boolean consumed, int x, int y) {}
}