nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 69c04cad: Race condition in cursor move. 

* commit '69c04cadc7c017f9de53f13ea045347b80316d4a':
  Race condition in cursor move.
main
Dan Zivkovic 2015-02-27 18:36:42 +00:00 committed by Android Git Automerger
parent 7d5cbb611e 69c04cadc7
commit 29de00a52d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
java/src/com/android/inputmethod/latin/WordComposer.java
View File

@ -232,31 +232,33 @@ public final class WordComposer {
* @return true if the cursor is still inside the composing word, false otherwise. * @return true if the cursor is still inside the composing word, false otherwise.
*/ */
public boolean moveCursorByAndReturnIfInsideComposingWord(final int expectedMoveAmount) { public boolean moveCursorByAndReturnIfInsideComposingWord(final int expectedMoveAmount) {
int actualMoveAmountWithinWord = 0; int actualMoveAmount = 0;
int cursorPos = mCursorPositionWithinWord; int cursorPos = mCursorPositionWithinWord;
// TODO: Don't make that copy. We can do this directly from mTypedWordCache. // TODO: Don't make that copy. We can do this directly from mTypedWordCache.
final int[] codePoints = StringUtils.toCodePointArray(mTypedWordCache); final int[] codePoints = StringUtils.toCodePointArray(mTypedWordCache);
if (expectedMoveAmount >= 0) { if (expectedMoveAmount >= 0) {
// Moving the cursor forward for the expected amount or until the end of the word has // Moving the cursor forward for the expected amount or until the end of the word has
// been reached, whichever comes first. // been reached, whichever comes first.
while (actualMoveAmountWithinWord < expectedMoveAmount && cursorPos < mCodePointSize) { while (actualMoveAmount < expectedMoveAmount && cursorPos < codePoints.length) {
actualMoveAmountWithinWord += Character.charCount(codePoints[cursorPos]); actualMoveAmount += Character.charCount(codePoints[cursorPos]);
++cursorPos; ++cursorPos;
} }
} else { } else {
// Moving the cursor backward for the expected amount or until the start of the word // Moving the cursor backward for the expected amount or until the start of the word
// has been reached, whichever comes first. // has been reached, whichever comes first.
while (actualMoveAmountWithinWord > expectedMoveAmount && cursorPos > 0) { while (actualMoveAmount > expectedMoveAmount && cursorPos > 0) {
--cursorPos; --cursorPos;
actualMoveAmountWithinWord -= Character.charCount(codePoints[cursorPos]); actualMoveAmount -= Character.charCount(codePoints[cursorPos]);
} }
} }
// If the actual and expected amounts differ, we crossed the start or the end of the word // If the actual and expected amounts differ, we crossed the start or the end of the word
// so the result would not be inside the composing word. // so the result would not be inside the composing word.
if (actualMoveAmountWithinWord != expectedMoveAmount) return false; if (actualMoveAmount != expectedMoveAmount) {
return false;
}
mCursorPositionWithinWord = cursorPos; mCursorPositionWithinWord = cursorPos;
mCombinerChain.applyProcessedEvent(mCombinerChain.processEvent(mEvents, mCombinerChain.applyProcessedEvent(mCombinerChain.processEvent(
Event.createCursorMovedEvent(cursorPos))); mEvents, Event.createCursorMovedEvent(cursorPos)));
return true; return true;
} }