Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1894)

Unified Diff: content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java

Issue 44983003: Events ignoring ack disposition receive synthetic acks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add test for single synchronous ack. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
index a680c9823e2a5198f97fca9f9ba0447bd16c0985..7b13c71f6ca1a9a78584f2f537ac5bc57d8ec3e6 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
@@ -192,8 +192,9 @@ class ContentViewGestureHandler implements LongPressDelegate {
// These have to be kept in sync with content/port/common/input_event_ack_state.h
static final int INPUT_EVENT_ACK_STATE_UNKNOWN = 0;
static final int INPUT_EVENT_ACK_STATE_CONSUMED = 1;
- static final int INPUT_EVENT_ACK_STATE_NOT_CONSUMED = 2;
- static final int INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS = 3;
+ static final int INPUT_EVENT_ACK_STATE_IGNORED = 2;
+ static final int INPUT_EVENT_ACK_STATE_NOT_CONSUMED = 3;
+ static final int INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS = 4;
// Return values of sendPendingEventToNative();
static final int EVENT_FORWARDED_TO_NATIVE = 0;
@@ -1076,6 +1077,7 @@ class ContentViewGestureHandler implements LongPressDelegate {
assert(false);
break;
case INPUT_EVENT_ACK_STATE_CONSUMED:
+ case INPUT_EVENT_ACK_STATE_IGNORED:
mJavaScriptIsConsumingGesture = true;
mZoomManager.passTouchEventThrough(ackedEvent);
trySendPendingEventsToNative();

Powered by Google App Engine
This is Rietveld 408576698