From 39bb698cd255962fb69c99bc5179b9590b6efbb3 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 1 Sep 2011 09:39:58 -0700
Subject: [PATCH] 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 | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 5200b1234f4d5..673db8c251e5e 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4007,12 +4007,9 @@ public class WebView extends AbsoluteLayout
         // 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);
     }