| Index: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java
|
| diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java
|
| index 68452ed5d89f3bc263c53c0b43876a28a40f1718..41db8e969d71e2dc8cbbac53fba625868ff0783f 100644
|
| --- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java
|
| +++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java
|
| @@ -53,6 +53,7 @@ public class TestInputMethodManagerWrapper extends InputMethodManagerWrapper {
|
| Log.d(TAG, "restartInput: count [%d]", mRestartInputCounter);
|
| EditorInfo editorInfo = new EditorInfo();
|
| mInputConnection = mContentViewCore.onCreateInputConnection(editorInfo);
|
| + mSelection.set(editorInfo.initialSelStart, editorInfo.initialSelEnd);
|
| }
|
|
|
| @Override
|
| @@ -88,13 +89,9 @@ public class TestInputMethodManagerWrapper extends InputMethodManagerWrapper {
|
| int candidatesStart, int candidatesEnd) {
|
| Log.d(TAG, "updateSelection: [%d %d] [%d %d]", selStart, selEnd, candidatesStart,
|
| candidatesEnd);
|
| - Pair<Range, Range> newUpdateSelection =
|
| - new Pair<>(new Range(selStart, selEnd), new Range(candidatesStart, candidatesEnd));
|
| - if (!mUpdateSelectionList.isEmpty()) {
|
| - Pair<Range, Range> lastUpdateSelection =
|
| - mUpdateSelectionList.get(mUpdateSelectionList.size() - 1);
|
| - if (lastUpdateSelection.equals(newUpdateSelection)) return;
|
| - }
|
| + Range selection = new Range(selStart, selEnd);
|
| + Range composition = new Range(candidatesStart, candidatesEnd);
|
| + if (selection.equals(mSelection) && composition.equals(mComposition)) return;
|
| mUpdateSelectionList.add(new Pair<Range, Range>(
|
| new Range(selStart, selEnd), new Range(candidatesStart, candidatesEnd)));
|
| mSelection.set(selStart, selEnd);
|
|
|