diff options
| author | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-01 05:55:28 +0000 |
|---|---|---|
| committer | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-01 05:55:28 +0000 |
| commit | 2a5bbe816de78b76737641aaa973a1df91a052a3 (patch) | |
| tree | cab064036ab9dd1ee8b26fa1a565056bd644e757 | |
| parent | 5bf85c0f5647d79e53085c0324e3a6201f3c54cf (diff) | |
| download | chromium_src-2a5bbe816de78b76737641aaa973a1df91a052a3.zip chromium_src-2a5bbe816de78b76737641aaa973a1df91a052a3.tar.gz chromium_src-2a5bbe816de78b76737641aaa973a1df91a052a3.tar.bz2 | |
Add state INPUT_EVENT_ACK_STATE_UNKNOWN
This was added for CrOS support for touch event tracking, currently causes
us to misinterpret the acks we are receiving.
BUG=168350
NOTRY=True
Review URL: https://codereview.chromium.org/12114040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180091 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java | 11 |
1 files changed, 8 insertions, 3 deletions
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 5d32f4b..eac7492 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 @@ -172,9 +172,10 @@ class ContentViewGestureHandler implements LongPressDelegate { static final int GESTURE_LONG_TAP = 14; // These have to be kept in sync with content/port/common/input_event_ack_state.h - static final int INPUT_EVENT_ACK_STATE_CONSUMED = 0; - static final int INPUT_EVENT_ACK_STATE_NOT_CONSUMED = 1; - static final int INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS = 2; + 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; /** * This is an interface to handle MotionEvent related communication with the native side also @@ -788,6 +789,10 @@ class ContentViewGestureHandler implements LongPressDelegate { MotionEvent ackedEvent = mPendingMotionEvents.removeFirst(); MotionEvent nextEvent = mPendingMotionEvents.peekFirst(); switch (ackResult) { + case INPUT_EVENT_ACK_STATE_UNKNOWN: + // This should never get sent. + assert(false); + break; case INPUT_EVENT_ACK_STATE_CONSUMED: mJavaScriptIsConsumingGesture = true; mZoomManager.passTouchEventThrough(ackedEvent); |