From e655884873225a8b146ee2f992baafbfdcacb344 Mon Sep 17 00:00:00 2001 From: "stoyan@chromium.org" Date: Wed, 10 Feb 2010 00:18:27 +0000 Subject: Fix crash. Happens in LaunchDelegate::LaunchComplete if delegate (ChromeFrameAutomationClient) is destroyed before launch callback is invoked. Happens when underlying automation proxy is going to be shared to new instance of ChromeFrameAutomationClient and we destroy that instance before receiving LaunchComplete callback. Still have a race (and possible crash) for automation_server_ in ReleaseAutomationServer and LaunchComplete, TEST=test added. Review URL: http://codereview.chromium.org/582018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38551 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/chrome_frame_automation.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome_frame/chrome_frame_automation.h') diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h index 4cfa187..8b2f801 100644 --- a/chrome_frame/chrome_frame_automation.h +++ b/chrome_frame/chrome_frame_automation.h @@ -122,7 +122,7 @@ class ProxyFactory { void CreateProxy(ProxyCacheEntry* entry, const ChromeFrameLaunchParams& params, LaunchDelegate* delegate); - void DestroyProxy(ProxyCacheEntry* entry); + void ReleaseProxy(ProxyCacheEntry* entry, base::WaitableEvent* done); void SendUMAData(ProxyCacheEntry* proxy_entry); -- cgit v1.1