Merge "Partial rollback of I9ebc92dc"

2011-09-01 13:46:03 -07:00
parent 40f2faadc1 39bb698cd2
commit 0aadeca6cc
1 changed files with 3 additions and 6 deletions
--- 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);
    }