Merge "Improve when highlight rects are shown"

Author: jreck

core/java/android/webkit/WebViewClassic.java

@@ -6002,9 +6002,9 @@ private void handleTouchEventCommon(MotionEvent event, int action, int x, int y)
                     data.mNativeLayer = nativeScrollableLayer(
                             contentX, contentY, data.mNativeLayerRect, null);
                     data.mSlop = viewToContentDimension(mNavSlop);
-                    mTouchHighlightRegion.setEmpty();
+                    removeTouchHighlight();
                     if (!mBlockWebkitViewMessages) {
-                        mTouchHighlightRequested = System.currentTimeMillis();
+                        mTouchHighlightRequested = SystemClock.uptimeMillis();
                         mWebViewCore.sendMessageAtFrontOfQueue(
                                 EventHub.HIT_TEST, data);
                     }
@@ -7777,13 +7777,16 @@ private boolean shouldDrawHighlightRect() {
         if (mFocusedNode.mHasFocus && mFocusedNode.mEditable) {
             return false;
         }
-        long delay = System.currentTimeMillis() - mTouchHighlightRequested;
+        long delay = SystemClock.uptimeMillis() - mTouchHighlightRequested;
         if (delay < ViewConfiguration.getTapTimeout()) {
             Rect r = mTouchHighlightRegion.getBounds();
             mWebView.postInvalidateDelayed(delay, r.left, r.top, r.right, r.bottom);
             return false;
         }
-        return true;
+        if (mInputDispatcher == null) {
+            return false;
+        }
+        return mInputDispatcher.shouldShowTapHighlight();
     }
 
 

core/java/android/webkit/WebViewInputDispatcher.java

@@ -349,6 +349,12 @@ private void unscheduleLongPressLocked() {
         }
     }
 
+    public boolean shouldShowTapHighlight() {
+        synchronized (mLock) {
+            return mPostLongPressScheduled || mPostClickScheduled;
+        }
+    }
+
     private void postLongPress() {
         synchronized (mLock) {
             if (!mPostLongPressScheduled) {