summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 16:58:10 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 16:58:10 +0000
commit8a4b7806e1cccdce8ca6786e8a95716adebb962d (patch)
tree0e1ffa8a58b462214d732d75157adbb7d9231b6d /chrome_frame
parent57343291d8800c981abee832b5ccadd27699bbdd (diff)
downloadchromium_src-8a4b7806e1cccdce8ca6786e8a95716adebb962d.zip
chromium_src-8a4b7806e1cccdce8ca6786e8a95716adebb962d.tar.gz
chromium_src-8a4b7806e1cccdce8ca6786e8a95716adebb962d.tar.bz2
Handle two cases that we previously weren't expecting.
The first is inside GCF where we get a tab message after the target tab has been torn down. Before, we set handled to 'false' which would cause the message to end up in AutomationProxy which doesn't know how to handle it. The fix is to drop the message and treat it as handled. The second is when we attempt to send a download request to the host browser but the request has already been terminated. We treated this as a fatal error, but now only log an error. TEST=See repro steps in bug. BUG=69595 Review URL: http://codereview.chromium.org/6260009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71805 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame_automation.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index aa5d946..2204486 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -79,6 +79,8 @@ class ChromeFrameAutomationProxyImpl::TabProxyNotificationMessageFilter
tab->Release();
} else {
DLOG(ERROR) << "Failed to find TabProxy for tab:" << message.routing_id();
+ // To prevent subsequent crashes, we set handled to true in this case.
+ handled = true;
}
return handled;
}