| Index: ui/base/ime/input_method_linux_x11.cc
|
| diff --git a/ui/base/ime/input_method_linux_x11.cc b/ui/base/ime/input_method_linux_x11.cc
|
| index efbd94011dca2b5e53e2fa358adf2dac7b5af633..2059e6e9b58c60c423bb84a35d0b89e01df14cb1 100644
|
| --- a/ui/base/ime/input_method_linux_x11.cc
|
| +++ b/ui/base/ime/input_method_linux_x11.cc
|
| @@ -108,26 +108,23 @@ bool InputMethodLinuxX11::DispatchKeyEvent(const ui::KeyEvent& event) {
|
|
|
| void InputMethodLinuxX11::OnTextInputTypeChanged(
|
| const TextInputClient* client) {
|
| - if (IsTextInputClientFocused(client)) {
|
| - input_method_context_->Reset();
|
| - // TODO(yoichio): Support inputmode HTML attribute.
|
| - input_method_context_->OnTextInputTypeChanged(client->GetTextInputType());
|
| - }
|
| - InputMethodBase::OnTextInputTypeChanged(client);
|
| + if (!IsTextInputClientFocused(client))
|
| + return;
|
| + input_method_context_->Reset();
|
| + // TODO(yoichio): Support inputmode HTML attribute.
|
| + input_method_context_->OnTextInputTypeChanged(client->GetTextInputType());
|
| }
|
|
|
| void InputMethodLinuxX11::OnCaretBoundsChanged(const TextInputClient* client) {
|
| - if (IsTextInputClientFocused(client)) {
|
| - input_method_context_->OnCaretBoundsChanged(
|
| - GetTextInputClient()->GetCaretBounds());
|
| - }
|
| - InputMethodBase::OnCaretBoundsChanged(client);
|
| + if (!IsTextInputClientFocused(client))
|
| + return;
|
| + input_method_context_->OnCaretBoundsChanged(
|
| + GetTextInputClient()->GetCaretBounds());
|
| }
|
|
|
| void InputMethodLinuxX11::CancelComposition(const TextInputClient* client) {
|
| if (!IsTextInputClientFocused(client))
|
| return;
|
| -
|
| input_method_context_->Reset();
|
| input_method_context_->OnTextInputTypeChanged(client->GetTextInputType());
|
| }
|
|
|