| Index: ui/base/ime/input_method_tsf.cc
|
| diff --git a/ui/base/ime/input_method_tsf.cc b/ui/base/ime/input_method_tsf.cc
|
| index 845172dd09a710aaa763d44afae57910bee0f8b1..5e6de052e55a0f9e38fbbd772e253e3b3aee0139 100644
|
| --- a/ui/base/ime/input_method_tsf.cc
|
| +++ b/ui/base/ime/input_method_tsf.cc
|
| @@ -98,17 +98,16 @@ bool InputMethodTSF::OnUntranslatedIMEMessage(
|
| }
|
|
|
| void InputMethodTSF::OnTextInputTypeChanged(const TextInputClient* client) {
|
| - if (IsTextInputClientFocused(client) && IsWindowFocused(client)) {
|
| - ui::TSFBridge::GetInstance()->CancelComposition();
|
| - ui::TSFBridge::GetInstance()->OnTextInputTypeChanged(client);
|
| - }
|
| - InputMethodWin::OnTextInputTypeChanged(client);
|
| + if (!IsTextInputClientFocused(client) || !IsWindowFocused(client))
|
| + return;
|
| + ui::TSFBridge::GetInstance()->CancelComposition();
|
| + ui::TSFBridge::GetInstance()->OnTextInputTypeChanged(client);
|
| }
|
|
|
| void InputMethodTSF::OnCaretBoundsChanged(const TextInputClient* client) {
|
| - if (IsTextInputClientFocused(client) && IsWindowFocused(client))
|
| - ui::TSFBridge::GetInstance()->OnTextLayoutChanged();
|
| - InputMethodWin::OnCaretBoundsChanged(client);
|
| + if (!IsTextInputClientFocused(client) || !IsWindowFocused(client))
|
| + return;
|
| + ui::TSFBridge::GetInstance()->OnTextLayoutChanged();
|
| }
|
|
|
| void InputMethodTSF::CancelComposition(const TextInputClient* client) {
|
|
|