diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 17:49:35 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 17:49:35 +0000 |
| commit | b0febbf8b696aa9d884467a34842411c5301837e (patch) | |
| tree | 8daaf1ab2567ce20fdfa771f0daf41a91c6edb5c /chrome_frame/chrome_frame_automation.h | |
| parent | d56127cc3bf41ae4df9a5586f132d02cc6917cfd (diff) | |
| download | chromium_src-b0febbf8b696aa9d884467a34842411c5301837e.zip chromium_src-b0febbf8b696aa9d884467a34842411c5301837e.tar.gz chromium_src-b0febbf8b696aa9d884467a34842411c5301837e.tar.bz2 | |
The ChromeFrameAutomationClient class needs to be refcounted as it implements the PluginRequestHandler
interface which is maintained by individual requests which can outlive the active document/activex instances.
I ran into a crash where UrlmonUrlRequest was calling into an invalid PluginRequestHandler pointer which
had been destroyed just before.
We also need to ensure that UrlmonUrlRequest and ChromeFrameActiveXBase select the multi threaded model as
AddRef/Release can be invoked from multiple threads.
I also removed the CleanupAsyncRequests function in ChromeFrameAutomationClient and moved all the code to CleanupRequests, which ensures that we treat synchronous
and asynchronous requests similarly.
There are instances where an automation client instance is created and destroyed without being initialized which causes a spurious assert to fire in the Uninitialize function. I added a check in the Uninitialize function to return if the state is uninitialized.
Bug=none
Review URL: http://codereview.chromium.org/386014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.h')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h index 8def0fd..90c1951 100644 --- a/chrome_frame/chrome_frame_automation.h +++ b/chrome_frame/chrome_frame_automation.h @@ -233,9 +233,6 @@ class ChromeFrameAutomationClient PluginUrlRequest* LookupRequest(int request_id) const; bool IsValidRequest(PluginUrlRequest* request) const; void CleanupRequests(); - // For IE the host network stack requests are issued on a separate thread, - // which requires the requests to be cleaned up asynchronously. - void CleanupAsyncRequests(); void set_use_chrome_network(bool use_chrome_network) { use_chrome_network_ = use_chrome_network; @@ -263,13 +260,6 @@ class ChromeFrameAutomationClient void SetPageFontSize(enum AutomationPageFontSize); - // Dummy reference counting functions to enable us to use the - // TaskMarshallerThroughWindowsMessages functionality. At this point we don't - // need to ensure that any tasks executed on us grab a reference to ensure - // that the instance remains valid. - void AddRef() {} - void Release() {} - protected: // ChromeFrameAutomationProxy::LaunchDelegate implementation. virtual void LaunchComplete(ChromeFrameAutomationProxy* proxy, |