From 861c310c23653fddecb35bde6ea58e47cafaa1a6 Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Wed, 27 May 2009 21:40:09 +0000 Subject: 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 --- chrome/browser/renderer_host/render_widget_host_view_mac.mm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'chrome/browser/renderer_host') 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; } -- cgit v1.1