diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 01:39:26 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 01:39:26 +0000 |
| commit | 70277f6b896c776999e356d6546d65fd999dea05 (patch) | |
| tree | 455a61a961f398d2b8dbab0c4673b1bae792b589 /chrome_frame/urlmon_moniker.h | |
| parent | e6e55fb4b70fb47c6959b68e0cccd328bed9c358 (diff) | |
| download | chromium_src-70277f6b896c776999e356d6546d65fd999dea05.zip chromium_src-70277f6b896c776999e356d6546d65fd999dea05.tar.gz chromium_src-70277f6b896c776999e356d6546d65fd999dea05.tar.bz2 | |
Avoid a crash in ChromeFrame in the BindToStorage call initiated when our active document is loaded. The crash occurs while dereferencing a
NULL delegate which is the case in the pending request object created by the active document to handle the initial load.
Fix for this is to maintain a pending state in the request object. We ignore all OnProgress notifications in this state. When Chrome requests
data for the top level url this state is cleared.
Consolidated the number of bind context information structures into one which contains everything we need in ChromeFrame, i.e. to decide to
switch to Chrome, indicating whether the request came from Chrome, etc.
Review URL: http://codereview.chromium.org/1654012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/urlmon_moniker.h')
| -rw-r--r-- | chrome_frame/urlmon_moniker.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome_frame/urlmon_moniker.h b/chrome_frame/urlmon_moniker.h index 97f60ff..7aa36d8 100644 --- a/chrome_frame/urlmon_moniker.h +++ b/chrome_frame/urlmon_moniker.h @@ -88,11 +88,6 @@ class NavigationManager { // TLS. Returns NULL if no instance exists on the current thread. static NavigationManager* GetThreadInstance(); - // Mark a bind context for navigation by storing a bind context param. - static bool SetForSwitch(IBindCtx* bind_context, IStream* data); - static bool IsSetToSwitch(IBindCtx* bind_context); - static HRESULT ResetSwitch(IBindCtx* bind_context, IStream** data); - void RegisterThreadInstance(); void UnregisterThreadInstance(); |