From 8072976d7aefa15b2f4918d7e334eefce901cb65 Mon Sep 17 00:00:00 2001 From: George Mount Date: Tue, 1 May 2012 08:37:58 -0700 Subject: [PATCH] Fix flicker while selecting text. Bug 6413113 Change-Id: I5c8d2cda1eae9d5670c757711c49ccc9e47b4127 --- core/java/android/webkit/WebViewClassic.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index a9b32b887adc1..3b16fbd2446a9 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -6381,10 +6381,14 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc mSelectDraggingTextQuad.p4.x, mSelectDraggingTextQuad.p3.x); float newY = scaleCoordinate(scale, mSelectDraggingTextQuad.p4.y, mSelectDraggingTextQuad.p3.y); - int x = Math.max(mEditTextContentBounds.left, - Math.min(mEditTextContentBounds.right, Math.round(newX))); - int y = Math.max(mEditTextContentBounds.top, - Math.min(mEditTextContentBounds.bottom, Math.round(newY))); + int x = Math.round(newX); + int y = Math.round(newY); + if (mIsEditingText) { + x = Math.max(mEditTextContentBounds.left, + Math.min(mEditTextContentBounds.right, x)); + y = Math.max(mEditTextContentBounds.top, + Math.min(mEditTextContentBounds.bottom, y)); + } mSelectDraggingCursor.set(x, y); }