Merge 205322 "Fix stack overflow in confirmTouchEvent()"

> Fix stack overflow in confirmTouchEvent()
> 
> confirmTouchEvent() may be called synchronously before sendTouchEvent()
> returns. In the PENDING_ACK_ORIGINAL_EVENT state of TouchEventTimeoutHandler,
> the Java stack will overflow if confirmTouchEvent() is called synchronously.
> 
> Set state before send the event.
> 
> NOTRY=true
> BUG=247683
> R=yusufo@chromium.org
> TBR=tedchoc@chromium.org
> 
> Review URL: https://chromiumcodereview.appspot.com/16739014

TBR=wangxianzhu@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205683 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 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 13919ec..42483bd 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
@@ -206,15 +206,15 @@ class ContentViewGestureHandler implements LongPressDelegate {
                 case PENDING_ACK_ORIGINAL_EVENT:
                     // The ACK to the original event is received after timeout.
                     // Inject a touchcancel event.
+                    mPendingAckState = PENDING_ACK_CANCEL_EVENT;
                     mMotionEventDelegate.sendTouchEvent(mEventTime + TOUCH_EVENT_TIMEOUT,
                             TouchPoint.TOUCH_EVENT_TYPE_CANCEL, mTouchPoints);
                     mTouchPoints = null;
-                    mPendingAckState = PENDING_ACK_CANCEL_EVENT;
                     return true;
                 case PENDING_ACK_CANCEL_EVENT:
                     // The ACK to the injected touchcancel event is received.
-                    drainAllPendingEventsUntilNextDown();
                     mPendingAckState = PENDING_ACK_NONE;
+                    drainAllPendingEventsUntilNextDown();
                     return true;
                 default:
                     assert false : "Never reached";