Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Unified Diff: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java

Issue 2315643002: DO NOT SUBMIT: Allow selection change update before beginBatchEdit (Closed)
Patch Set: fix tests Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/android/junit/src/org/chromium/content/browser/input/ThreadedInputConnectionTest.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « content/public/android/junit/src/org/chromium/content/browser/input/ThreadedInputConnectionTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698