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

[IL46] Remove a useless message passing.

Browse source 
The only point of this message is to send the processing on another
thread. However, this will be accomplished later.
Here is the exact call graph:
0. onUpdateBatchInput
1. -> MSG_UPDATE_GESTURE_PREVIEW_AND_SUGGESTION_STRIP
2. -> updateBatchInputSync
3. -> getSuggestedWordsGestureLocked
4. -> MSG_GET_SUGGESTED_WORDS
5. -> LatinIME#getSuggestedWords

The point of both step 1. and step 4. is to make sure the processing
is happening on the InputUpdater thread. Thus, it's useless to do
it twice.

Bug: 11326092
Bug: 8636060
Change-Id: Iceebb9e8879a8f15b73c987f5fd3489f27699be4
This commit is contained in:
Jean Chalard 2013-12-25 18:24:48 +09:00
parent 31ff2a4335
commit 71a3e96382
1 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -1295,19 +1295,12 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mLatinIme = latinIme; mLatinIme = latinIme;
} }
private static final int MSG_UPDATE_GESTURE_PREVIEW_AND_SUGGESTION_STRIP = 1; private static final int MSG_GET_SUGGESTED_WORDS = 1;
private static final int MSG_GET_SUGGESTED_WORDS = 2;
// Called on the InputUpdater thread by the Handler code. // Called on the InputUpdater thread by the Handler code.
@Override @Override
public boolean handleMessage(final Message msg) { public boolean handleMessage(final Message msg) {
// TODO: straighten message passing - we don't need two kinds of messages calling
// each other.
switch (msg.what) { switch (msg.what) {
case MSG_UPDATE_GESTURE_PREVIEW_AND_SUGGESTION_STRIP:
updateBatchInput((InputPointers)msg.obj, msg.arg2 /* sequenceNumber */,
false /* forEnd */);
break;
case MSG_GET_SUGGESTED_WORDS: case MSG_GET_SUGGESTED_WORDS:
mLatinIme.getSuggestedWords(msg.arg1 /* sessionId */, mLatinIme.getSuggestedWords(msg.arg1 /* sessionId */,
msg.arg2 /* sequenceNumber */, (OnGetSuggestedWordsCallback) msg.obj); msg.arg2 /* sequenceNumber */, (OnGetSuggestedWordsCallback) msg.obj);
@ -1319,7 +1312,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// Called on the UI thread by LatinIME. // Called on the UI thread by LatinIME.
public void onStartBatchInput() { public void onStartBatchInput() {
synchronized (mLock) { synchronized (mLock) {
mHandler.removeMessages(MSG_UPDATE_GESTURE_PREVIEW_AND_SUGGESTION_STRIP);
mInBatchInput = true; mInBatchInput = true;
} }
} }
@ -1338,7 +1330,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
private void updateBatchInput(final InputPointers batchPointers, private void updateBatchInput(final InputPointers batchPointers,
final int sequenceNumber, final boolean forEnd) { final int sequenceNumber, final boolean forEnd) {
synchronized (mLock) { synchronized (mLock) {
mHandler.removeMessages(MSG_UPDATE_GESTURE_PREVIEW_AND_SUGGESTION_STRIP);
if (!mInBatchInput) { if (!mInBatchInput) {
// Batch input has ended or canceled while the message was being delivered. // Batch input has ended or canceled while the message was being delivered.
return; return;
@ -1375,14 +1366,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// Called on the UI thread by LatinIME. // Called on the UI thread by LatinIME.
public void onUpdateBatchInput(final InputPointers batchPointers, public void onUpdateBatchInput(final InputPointers batchPointers,
final int sequenceNumber) { final int sequenceNumber) {
synchronized (mLock) { updateBatchInput(batchPointers, sequenceNumber, false /* forEnd */);
if (mHandler.hasMessages(MSG_UPDATE_GESTURE_PREVIEW_AND_SUGGESTION_STRIP)) {
return;
}
mHandler.obtainMessage(MSG_UPDATE_GESTURE_PREVIEW_AND_SUGGESTION_STRIP,
0 /* arg1 */,sequenceNumber /* arg2 */,
batchPointers /* obj */).sendToTarget();
}
} }
/** /**
@ -1395,7 +1379,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// Called on the UI thread by LatinIME. // Called on the UI thread by LatinIME.
public void onCancelBatchInput() { public void onCancelBatchInput() {
synchronized (mLock) { synchronized (mLock) {
mHandler.removeMessages(MSG_UPDATE_GESTURE_PREVIEW_AND_SUGGESTION_STRIP);
mInBatchInput = false; mInBatchInput = false;
} }
} }
@ -1443,7 +1426,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
void quitLooper() { void quitLooper() {
mHandler.removeMessages(MSG_GET_SUGGESTED_WORDS); mHandler.removeMessages(MSG_GET_SUGGESTED_WORDS);
mHandler.removeMessages(MSG_UPDATE_GESTURE_PREVIEW_AND_SUGGESTION_STRIP);
mHandler.getLooper().quit(); mHandler.getLooper().quit();
} }
} }