diff options
| author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 02:13:36 +0000 |
|---|---|---|
| committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 02:13:36 +0000 |
| commit | 232211d7f6d0830fbc18e9775d24616827ffc57e (patch) | |
| tree | ce6fb627693843179dd3321db5608aa81a97d27b /views/widget | |
| parent | 5afcbf4f9b2e49c8d84bacc585f051bb472b8501 (diff) | |
| download | chromium_src-232211d7f6d0830fbc18e9775d24616827ffc57e.zip chromium_src-232211d7f6d0830fbc18e9775d24616827ffc57e.tar.gz chromium_src-232211d7f6d0830fbc18e9775d24616827ffc57e.tar.bz2 | |
Fix infinite loop in GetInputMethod.
RWHVV shouldn't update ime if there is no inputmethod associated with the view.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7976028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
| -rw-r--r-- | views/widget/widget.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/views/widget/widget.cc b/views/widget/widget.cc index c9a0f06..e108e84 100644 --- a/views/widget/widget.cc +++ b/views/widget/widget.cc @@ -622,7 +622,12 @@ InputMethod* Widget::GetInputMethod() { return input_method_.get(); } else { Widget* toplevel = GetTopLevelWidget(); - return toplevel ? toplevel->GetInputMethod() : NULL; + // If GetTopLevelWidget() returns itself which is not toplevel, + // the widget is detached from toplevel widget. + // TODO(oshima): Fix GetTopLevelWidget() to return NULL + // if there is no toplevel. We probably need to add GetTopMostWidget() + // to replace some use cases. + return (toplevel && toplevel != this) ? toplevel->GetInputMethod() : NULL; } } |