diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 20:46:34 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 20:46:34 +0000 |
| commit | f77651280b8b72ed03efd8b3202d4659df30ce44 (patch) | |
| tree | 04dbf6aaabbcc3bd8844db9cb759f9a9ea481cf0 /ui/base/ime/mock_input_method.cc | |
| parent | 1f576f19dbb70b9c65d4658212b0c34f0d20a5af (diff) | |
| download | chromium_src-f77651280b8b72ed03efd8b3202d4659df30ce44.zip chromium_src-f77651280b8b72ed03efd8b3202d4659df30ce44.tar.gz chromium_src-f77651280b8b72ed03efd8b3202d4659df30ce44.tar.bz2 | |
keyboard: Fix a crash when the keyboard is created with a valid text-input type.
The KeyboardController attempts to shwo the keyboard-container after
creation if the current text-client can accept input. However, the
container hasn't been parented yet, and so it ends up causing a crash.
So instead of this, decide the visibility of the keyboard only after
it has been parented.
BUG=none
Review URL: https://codereview.chromium.org/14200002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/ime/mock_input_method.cc')
| -rw-r--r-- | ui/base/ime/mock_input_method.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/base/ime/mock_input_method.cc b/ui/base/ime/mock_input_method.cc index b010af6..5faba6a 100644 --- a/ui/base/ime/mock_input_method.cc +++ b/ui/base/ime/mock_input_method.cc @@ -17,7 +17,11 @@ void MockInputMethod::SetDelegate(internal::InputMethodDelegate* delegate) { } void MockInputMethod::SetFocusedTextInputClient(TextInputClient* client) { + if (text_input_client_ == client) + return; text_input_client_ = client; + if (client) + OnTextInputTypeChanged(client); } TextInputClient* MockInputMethod::GetTextInputClient() const { |