Merge 199851 "[Android] Fix AdapterInputConnection#finishComposi..."

> [Android] Fix AdapterInputConnection#finishComposingText()
>
> The previous fix https://chromiumcodereview.appspot.com/13996027
> did not fix the case when commitComposition("\n") is called right
> after finishComposingText(). It is caused by a bug in Blink crbug.com/237715.
>
> This will work until the Blink crbug.com/239923 gets implemented.
>
> TEST=updated ImeTest#testFinishComposingText()
> BUG=237480
> NOTRY=true
>
> Review URL: https://chromiumcodereview.appspot.com/15141006

TBR=aurimas@chromium.org

Review URL: https://codereview.chromium.org/14918007

git-svn-id: svn://svn.chromium.org/chrome/branches/1453/src@200126 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 3 deletions

diff --git a/content/public/android/java/src/org/chromium/content/browser/ImeAdapter.java b/content/public/android/java/src/org/chromium/content/browser/ImeAdapter.java
index 933dd20..093582b 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ImeAdapter.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ImeAdapter.java
@@ -689,13 +689,16 @@ class ImeAdapter {
             if (getComposingSpanStart(editable) == getComposingSpanEnd(editable)) {
                 return true;
             }
+            int selectionStart = Selection.getSelectionStart(editable);
+            int compositionStart = getComposingSpanStart(editable);
             super.finishComposingText();
 
             beginBatchEdit();
-            int selectionStart = Selection.getSelectionStart(editable);
-            int selectionEnd = Selection.getSelectionEnd(editable);
+            if (compositionStart != -1 && compositionStart < selectionStart
+                    && !mImeAdapter.setComposingRegion(compositionStart, selectionStart)) {
+                return false;
+            }
             if (!mImeAdapter.checkCompositionQueueAndCallNative("", 0, true)) return false;
-            if (!mImeAdapter.setEditableSelectionOffsets(selectionStart, selectionEnd)) return false;
             endBatchEdit();
             return true;
         }