summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net
diff options
context:
space:
mode:
authorkouhei@chromium.org <kouhei@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-27 05:47:53 +0000
committerkouhei@chromium.org <kouhei@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-27 05:47:53 +0000
commitb1e7562d49aef3d36df8a19ba796c059477b05af (patch)
treef7f62d771d44ef4e066b40713be71e7454555d6c /chrome/browser/net
parent4bc2d022d22a0bbd20e48cb7d91cbabc7972a11c (diff)
downloadchromium_src-b1e7562d49aef3d36df8a19ba796c059477b05af.zip
chromium_src-b1e7562d49aef3d36df8a19ba796c059477b05af.tar.gz
chromium_src-b1e7562d49aef3d36df8a19ba796c059477b05af.tar.bz2
Implement WebPrescientNetworking to trigger preconnect from blink.
Note to gardener: This patch requires the following Blink patch to be landed first: https://codereview.chromium.org/14746002/ This API is to be triggered from {mouse,gesture}-events on HTMLAnchorElement. BUG=235361 Review URL: https://chromiumcodereview.appspot.com/14749005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202370 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
-rw-r--r--chrome/browser/net/predictor.cc23
1 files changed, 14 insertions, 9 deletions
diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc
index 3af1cf3..0b132b0 100644
--- a/chrome/browser/net/predictor.cc
+++ b/chrome/browser/net/predictor.cc
@@ -275,20 +275,25 @@ void Predictor::AnticipateOmniboxUrl(const GURL& url, bool preconnectable) {
void Predictor::PreconnectUrlAndSubresources(const GURL& url,
const GURL& first_party_for_cookies) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (!predictor_enabled_)
- return;
- if (!url.is_valid() || !url.has_host())
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
+ BrowserThread::CurrentlyOn(BrowserThread::IO));
+ if (!predictor_enabled_ || !preconnect_enabled() ||
+ !url.is_valid() || !url.has_host())
return;
- if (preconnect_enabled()) {
- std::string host = url.HostNoBrackets();
- UrlInfo::ResolutionMotivation motivation(UrlInfo::EARLY_LOAD_MOTIVATED);
- const int kConnectionsNeeded = 1;
+
+ std::string host = url.HostNoBrackets();
+ UrlInfo::ResolutionMotivation motivation(UrlInfo::EARLY_LOAD_MOTIVATED);
+ const int kConnectionsNeeded = 1;
+ if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
PreconnectOnUIThread(CanonicalizeUrl(url), first_party_for_cookies,
motivation, kConnectionsNeeded,
url_request_context_getter_);
- PredictFrameSubresources(url.GetWithEmptyPath(), first_party_for_cookies);
+ } else {
+ PreconnectOnIOThread(CanonicalizeUrl(url), first_party_for_cookies,
+ motivation, kConnectionsNeeded,
+ url_request_context_getter_);
}
+ PredictFrameSubresources(url.GetWithEmptyPath(), first_party_for_cookies);
}
UrlList Predictor::GetPredictedUrlListAtStartup(