diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-27 21:40:09 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-27 21:40:09 +0000 |
| commit | 861c310c23653fddecb35bde6ea58e47cafaa1a6 (patch) | |
| tree | b302e69bbe24d0fefe9dcff1857d7650fa2e7a3e /chrome | |
| parent | 07a6dba82c9b8bbf8afb6d0503b43a1c155d7eba (diff) | |
| download | chromium_src-861c310c23653fddecb35bde6ea58e47cafaa1a6.zip chromium_src-861c310c23653fddecb35bde6ea58e47cafaa1a6.tar.gz chromium_src-861c310c23653fddecb35bde6ea58e47cafaa1a6.tar.bz2 | |
Make sure that we're restoring focus to a valid subview. (with Rohit)
BUG=http://crbug.com/12725
TEST=repro test mentioned in http://code.google.com/p/chromium/issues/detail?id=12725#c4
Review URL: http://codereview.chromium.org/113922
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17027 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host_view_mac.mm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm index 280cb90..0b141d8 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm @@ -455,8 +455,12 @@ void RenderWidgetHostViewMac::ShutdownHost() { } - (BOOL)becomeFirstResponder { + if (![self superview]) { + // We're dead, so becoming first responder is probably a bad idea. + return NO; + } + renderWidgetHostView_->render_widget_host_->Focus(); - return YES; } |