summaryrefslogtreecommitdiffstats
path: root/chrome_frame/urlmon_url_request_private.h
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-03 01:06:42 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-03 01:06:42 +0000
commit8129c12bcdaa3f76942db98d0e579c351aa79933 (patch)
tree7c8548cbb0a9736962ab9eabeb9d29162729d1ca /chrome_frame/urlmon_url_request_private.h
parent59395014c0ac449ba9b8273800aa09965d36412c (diff)
downloadchromium_src-8129c12bcdaa3f76942db98d0e579c351aa79933.zip
chromium_src-8129c12bcdaa3f76942db98d0e579c351aa79933.tar.gz
chromium_src-8129c12bcdaa3f76942db98d0e579c351aa79933.tar.bz2
Renabling the FullTabModeIE_ChromeFrameUnloadEventTest ChromeFrame test. This test failed at times
on the builder due to a deadlock between the urlmon worker thread in IE and the ui thread. This would occur when the active document instance was going away while the worker thread was waiting for a COM call to be marshaled to the UI thread which expects the thread to pump messages. The only interface which needs to be marshaled to the worker thread is the IBindCtx interface. Turns out that there is nothing of note in this object, except the bind options. The rest of the properties queried for all fail initially and then the caller register its own variants of these properties. Fix is to create a new IBindCtx interface and copy over the BIND_OPTs to this interface. Fixes bug http://code.google.com/p/chromium/issues/detail?id=34246 Bug=34246 Review URL: http://codereview.chromium.org/566026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/urlmon_url_request_private.h')
-rw-r--r--chrome_frame/urlmon_url_request_private.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome_frame/urlmon_url_request_private.h b/chrome_frame/urlmon_url_request_private.h
index 9b42904..3434ed7 100644
--- a/chrome_frame/urlmon_url_request_private.h
+++ b/chrome_frame/urlmon_url_request_private.h
@@ -29,7 +29,8 @@ class UrlmonUrlRequest
virtual bool Read(int bytes_to_read);
// Special function needed by ActiveDocument::Load()
- HRESULT ConnectToExistingMoniker(IMoniker* moniker, IBindCtx* context,
+ HRESULT ConnectToExistingMoniker(IMoniker* moniker,
+ BIND_OPTS* bind_opts,
const std::wstring& url);
// Used from "OnDownloadRequestInHost".