| 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 aec735ef3a91847d5fb64b59ce5f70a8346b92bd..4b6681c918f855082e2734add34c524d2460f692 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
|
| @@ -191,8 +191,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;
|
| @@ -1072,6 +1073,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();
|
|
|