Skip to content

Commit 9a6077e

Browse files
author
George Mount
committed
Disable selection when nothing selected.
Bug 6059606 Change-Id: I2c9acaa601e38a2cd0eec516709aa63f31ce0e29
1 parent a4b8a2e commit 9a6077e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

core/java/android/webkit/WebView.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9492,10 +9492,11 @@ private void updateTextSelectionFromMessage(int nodePointer,
94929492
}
94939493
}
94949494
nativeSetTextSelection(mNativeClass, data.mSelectTextPtr);
9495-
if (data.mSelectTextPtr != 0) {
9496-
mIsCaretSelection = (mFieldPointer == nodePointer)
9497-
&& (mFieldPointer != 0)
9498-
&& (data.mStart == data.mEnd);
9495+
9496+
if (data.mSelectTextPtr != 0 &&
9497+
(data.mStart != data.mEnd ||
9498+
(mFieldPointer == nodePointer && mFieldPointer != 0))) {
9499+
mIsCaretSelection = (data.mStart == data.mEnd);
94999500
if (!mSelectingText) {
95009501
setupWebkitSelect();
95019502
} else if (!mSelectionStarted) {

0 commit comments

Comments
 (0)