summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_active_document.cc
diff options
context:
space:
mode:
authorstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-08 16:53:57 +0000
committerstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-08 16:53:57 +0000
commit0ce46404deb06c137b2e2c253004c43cf42e8a70 (patch)
tree5a4026ada47051c2af1ccffe105a2d68a38ce77e /chrome_frame/chrome_active_document.cc
parent3e59bacae6bff857dfb5e3d3e8359dbde60ccb04 (diff)
downloadchromium_src-0ce46404deb06c137b2e2c253004c43cf42e8a70.zip
chromium_src-0ce46404deb06c137b2e2c253004c43cf42e8a70.tar.gz
chromium_src-0ce46404deb06c137b2e2c253004c43cf42e8a70.tar.bz2
Move Urlmon network requests to UI thread, thus allowing reusing the bind context (and already fetched data) via INET_E_TERMINATED_BIND error code.
Make caching of data more sensible, so the UI does not freeze (the reason why url request have been moved to a background thread). Always return INET_E_TERMINATED_BIND on OnDataAvailable when BSCF_LASTDATANOTIFICATION flag is detected, so if a subsequent DownloadToHost request comes from Chrome, bind context and already fetched data can be reused. BUG=36694 Review URL: http://codereview.chromium.org/1523014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_active_document.cc')
-rw-r--r--chrome_frame/chrome_active_document.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index 80ccd23..cec1b46 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -266,8 +266,8 @@ STDMETHODIMP ChromeActiveDocument::Load(BOOL fully_avalable,
return E_INVALIDARG;
}
- if (!is_chrome_protocol && data) {
- url_fetcher_.UseRequestDataForUrl(data, url);
+ if (!is_chrome_protocol) {
+ url_fetcher_.SetInfoForUrl(url, moniker_name, bind_context);
}
THREAD_SAFE_UMA_HISTOGRAM_CUSTOM_COUNTS("ChromeFrame.FullTabLaunchType",