Merge "Improve when highlight rects are shown" (5c44fee5) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebViewClassic.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -6002,9 +6002,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
		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 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
		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();
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -349,6 +349,12 @@ final class WebViewInputDispatcher {
		}
		}

		public boolean shouldShowTapHighlight() {
		synchronized (mLock) {
		return mPostLongPressScheduled \|\| mPostClickScheduled;
		}
		}

		private void postLongPress() {
		synchronized (mLock) {
		if (!mPostLongPressScheduled) {