Bug 781020 - Remove IME's composing spans when Gecko resets the composition state. r=blassey

--HG--
extra : rebase_source : 252b3b15dfe3570fdc4a695c0f720f7c7e59944a
This commit is contained in:
Chris Peterson 2012-08-08 16:16:59 -07:00
parent d3c73afd71
commit 0513cf7569

View File

@ -281,13 +281,6 @@ class GeckoInputConnection
// setComposingText() places the given text into the editable, replacing any existing // setComposingText() places the given text into the editable, replacing any existing
// composing text. This method will likely be called multiple times while we are composing // composing text. This method will likely be called multiple times while we are composing
// text. // text.
// If the replacement composition string is empty and we have no active composition string
// to replace, then just ignore the empty string. Some VKBs, such as TouchPal Keyboard,
// send us empty strings at inopportune times, deleting committed text. See bug 768106.
if (text.length() == 0 && !hasCompositionString())
return true;
return super.setComposingText(text, newCursorPosition); return super.setComposingText(text, newCursorPosition);
} }
@ -532,6 +525,7 @@ class GeckoInputConnection
} }
protected void resetCompositionState() { protected void resetCompositionState() {
removeComposingSpans(mEditable);
mCompositionStart = NO_COMPOSITION_STRING; mCompositionStart = NO_COMPOSITION_STRING;
mBatchMode = false; mBatchMode = false;
mUpdateRequest = null; mUpdateRequest = null;