Fix stuck state when long press on a button is performed.

content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
@@ skipping 146 matching lines @@
     // set this flag and defer the "last event for vsync" signal until the touch event is fully
     // processed. This allows multiple such gestures to be sent in a given frame.
     private boolean mSentGestureNeedsVSync;
     private long mLastVSyncGestureTimeMs;
 
     // Incremented and decremented when the methods onTouchEvent() and confirmTouchEvent() start
     // and finish execution, respectively. This provides accounting for synchronous calls to
     // confirmTouchEvent(), from either itself or onTouchEvent().
     private int mTouchEventHandlingStackDepth;
 
+    // Keeps track of the last long press event, if we end up opening a context menu, we would need
+    // to potentially use the event to send GESUTRE_SHOW_PRESS_CANCEL to remove ::active styling
+    private MotionEvent mLastLongPressEvent;
+
     static final int GESTURE_SHOW_PRESSED_STATE = 0;
     static final int GESTURE_DOUBLE_TAP = 1;
     static final int GESTURE_SINGLE_TAP_UP = 2;
     static final int GESTURE_SINGLE_TAP_CONFIRMED = 3;
     static final int GESTURE_SINGLE_TAP_UNCONFIRMED = 4;
     static final int GESTURE_LONG_PRESS = 5;
     static final int GESTURE_SCROLL_START = 6;
     static final int GESTURE_SCROLL_BY = 7;
     static final int GESTURE_SCROLL_END = 8;
     static final int GESTURE_FLING_START = 9;
@@ skipping 182 matching lines @@
     /**
      * Used to override the default long press detector, gesture detector and listener.
      * This is used for testing only.
      * @param longPressDetector The new LongPressDetector to be assigned.
      * @param gestureDetector The new GestureDetector to be assigned.
      * @param listener The new onGestureListener to be assigned.
      */
     void setTestDependencies(
             LongPressDetector longPressDetector, GestureDetector gestureDetector,
             OnGestureListener listener) {
-        mLongPressDetector = longPressDetector;
-        mGestureDetector = gestureDetector;
-        mListener = listener;
+        if (longPressDetector != null) mLongPressDetector = longPressDetector;
+        if (gestureDetector != null) mGestureDetector = gestureDetector;
+        if (listener != null) mListener = listener;
     }
 
     private void initGestureDetectors(final Context context) {
         final int scaledTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
         mScaledTouchSlopSquare = scaledTouchSlop * scaledTouchSlop;
         try {
             TraceEvent.begin();
             GestureDetector.SimpleOnGestureListener listener =
                 new GestureDetector.SimpleOnGestureListener() {
                     @Override
@@ skipping 219 matching lines @@
                         }
                         mDoubleTapY = e.getY();
                         return true;
                     }
 
                     @Override
                     public void onLongPress(MotionEvent e) {
                         if (!mZoomManager.isScaleGestureDetectionInProgress() &&
                                 (mDoubleTapDragMode == DOUBLE_TAP_DRAG_MODE_NONE ||
                                  isDoubleTapDragDisabled())) {
-                            sendShowPressCancelIfNecessary(e);
+                            mLastLongPressEvent = e;
                             sendMotionEventAsGesture(GESTURE_LONG_PRESS, e, null);
                         }
                     }
 
                     /**
                      * This method inspects the distance between where the user started touching
                      * the surface, and where she released. If the points are too far apart, we
                      * should assume that the web page has consumed the scroll-events in-between,
                      * and as such, this should not be considered a single-tap.
                      *
@@ skipping 229 matching lines @@
                 // processTouchEvent asynchronously.
                 return true;
             }
             return processTouchEvent(event);
         } finally {
             onTouchEventHandlingEnd();
             TraceEvent.end("onTouchEvent");
         }
     }
 
+    /**
+     * Handle content view losing focus -- ensure that any remaining active state is removed.
+     */
+    void onWindowFocusLost() {
+      if (mLongPressDetector.isInLongPress() && mLastLongPressEvent != null) {

[Ted C, 2013/09/13 23:50:26]

+2 indent for the conditional

[Maria, 2013/09/14 01:09:34]

Done.

+          sendShowPressCancelIfNecessary(mLastLongPressEvent);
+      }
+    }
+
     private MotionEvent obtainActionCancelMotionEvent() {
         return MotionEvent.obtain(
                 SystemClock.uptimeMillis(),
                 SystemClock.uptimeMillis(),
                 MotionEvent.ACTION_CANCEL, 0.0f,  0.0f,  0);
     }
 
     /**
      * Resets gesture handlers state; called on didStartLoading().
      * Note that this does NOT clear the pending motion events queue;
@@ skipping 283 matching lines @@
         mSentGestureNeedsVSync = mInputEventsDeliveredAtVSync && mTouchEventHandlingStackDepth > 0;
         mLastVSyncGestureTimeMs = timeMs;
         return mMotionEventDelegate.sendGesture(type, timeMs, x, y, extraParams);
     }
 
     void sendShowPressCancelIfNecessary(MotionEvent e) {
         if (!mShowPressIsCalled) return;
 
         if (sendMotionEventAsGesture(GESTURE_SHOW_PRESS_CANCEL, e, null)) {
             mShowPressIsCalled = false;
+            mLastLongPressEvent = null;
         }
     }
 
     /**
      * @return Whether the ContentViewGestureHandler can handle a MotionEvent right now. True only
      * if it's the start of a new stream (ACTION_DOWN), or a continuation of the current stream.
      */
     boolean canHandle(MotionEvent ev) {
         return ev.getAction() == MotionEvent.ACTION_DOWN ||
                 (mCurrentDownEvent != null && mCurrentDownEvent.getDownTime() == ev.getDownTime());
@@ skipping 59 matching lines @@
         assert (mDoubleTapDragMode == DOUBLE_TAP_DRAG_MODE_DISABLED ||
                 mDoubleTapDragMode == DOUBLE_TAP_DRAG_MODE_NONE);
         mDoubleTapDragMode = supportDoubleTapDrag ?
                 DOUBLE_TAP_DRAG_MODE_NONE : DOUBLE_TAP_DRAG_MODE_DISABLED;
     }
 
     private boolean isDoubleTapDragDisabled() {
         return mDoubleTapDragMode == DOUBLE_TAP_DRAG_MODE_DISABLED;
     }
 }