commit 082a9fa3438d343942851e538bb38b86ab1873b3
author John Reck <jreck@google.com> Mon Aug 29 12:55:50 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 29 12:55:50 2011 -0700
tree e0a214e1b33fb3d45732496abfd3d8341844fa53
parent 890be6b919ce0c65d018a2dc40a6a1d59bc2b14d
parent 0ba72ad45b724dfe8ce6fd5c0702e5da95dae514

Merge "Tap highlight fix + small perf increase"

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 6238b72..2aa481c 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4004,9 +4004,12 @@
         // state.
         // If mNativeClass is 0, we should not reach here, so we do not
         // need to check it again.
-        nativeRecordButtons(hasFocus() && hasWindowFocus(),
-                            mTouchMode == TOUCH_SHORTPRESS_START_MODE
-                            || mTrackballDown || mGotCenterDown, false);
+        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);
+        }
         drawCoreAndCursorRing(canvas, mBackgroundColor,
                 mDrawCursorRing && drawRings);
     }
@@ -4075,7 +4078,8 @@
         boolean drawJavaRings = !mTouchHighlightRegion.isEmpty()
                 && (mTouchMode == TOUCH_INIT_MODE
                 || mTouchMode == TOUCH_SHORTPRESS_START_MODE
-                || mTouchMode == TOUCH_SHORTPRESS_MODE);
+                || mTouchMode == TOUCH_SHORTPRESS_MODE
+                || mTouchMode == TOUCH_DONE_MODE);
         boolean drawNativeRings = !drawJavaRings;
         if (USE_WEBKIT_RINGS) {
             drawNativeRings = !drawJavaRings && !isInTouchMode();