Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Unified Diff: views/widget/widget.cc

Issue 7976028: Fix infinite loop in GetInputMethod. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_views.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/widget.cc
diff --git a/views/widget/widget.cc b/views/widget/widget.cc
index c9a0f06d157e1c57e184d5f9d1ce5736ac1ba029..e108e843586e5ca30d16dff975a0a4902bb7f17a 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;
}
}
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_views.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698