commit 39bb698cd255962fb69c99bc5179b9590b6efbb3
author John Reck <jreck@google.com> Thu Sep 01 09:39:58 2011 -0700
committer John Reck <jreck@google.com> Thu Sep 01 11:05:03 2011 -0700
tree 60148ec2251b71981a2685f2bf6fc6097c97edb4
parent 6c859576ad5ae5e870e3e96b650f015024b6c49e

Partial rollback of I9ebc92dc

 Bug: 5239166
 Turns out nativeRecordButtons is necessary even if we are not
 using the native selection rings.

Change-Id: I8e7713928b77c0098640b51ce8e8815dad0c9545

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 5200b12..673db8c 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4007,12 +4007,9 @@
         // state.
         // If mNativeClass is 0, we should not reach here, so we do not
         // need to check it again.
-        if (mDrawCursorRing && drawRings) {
-            // Only update if we are actually going to use the result
-            nativeRecordButtons(hasFocus() && hasWindowFocus(),
-                    mTouchMode == TOUCH_SHORTPRESS_START_MODE
-                    || mTrackballDown || mGotCenterDown, false);
-        }
+        nativeRecordButtons(hasFocus() && hasWindowFocus(),
+                (mTouchMode == TOUCH_SHORTPRESS_START_MODE && !USE_WEBKIT_RINGS)
+                || mTrackballDown || mGotCenterDown, false);
         drawCoreAndCursorRing(canvas, mBackgroundColor,
                 mDrawCursorRing && drawRings);
     }