summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorgavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-24 19:19:47 +0000
committergavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-24 19:19:47 +0000
commit61a99dd8b78f552519041f4cdcdcea4d97101e88 (patch)
treef382701426e85140be8f42237731ae0f7ab04f96 /net
parent7cde9091043bf12f967688962414f0e129ea7cc7 (diff)
downloadchromium_src-61a99dd8b78f552519041f4cdcdcea4d97101e88.zip
chromium_src-61a99dd8b78f552519041f4cdcdcea4d97101e88.tar.gz
chromium_src-61a99dd8b78f552519041f4cdcdcea4d97101e88.tar.bz2
Handle <link rel=prerender> in chrome.
This new link rel type is being used for the prerendering experiment instead of prefetch; this CL depends on webkit patch https://bugs.webkit.org/show_bug.cgi?id=61297 landing, but, together with that patch, chrome properly interprets and responds to link rel=prerender to launch prerendering. BUG=none TEST=PrerenderBrowserTest.* Review URL: http://codereview.chromium.org/6966016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/load_flags_list.h3
-rw-r--r--net/url_request/url_request_http_job.cc2
2 files changed, 3 insertions, 2 deletions
diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h
index 80fba2b..364ef94 100644
--- a/net/base/load_flags_list.h
+++ b/net/base/load_flags_list.h
@@ -104,7 +104,7 @@ LOAD_FLAG(PREFETCH, 1 << 23)
// Indicates that this load was requested by a page that is currently
// prerendering.
-LOAD_FLAG(PRERENDER, 1 << 24)
+LOAD_FLAG(PRERENDERING, 1 << 24)
// Indicates that this is a load that ignores limits and should complete
// immediately.
@@ -113,3 +113,4 @@ LOAD_FLAG(IGNORE_LIMITS, 1 << 25)
// Suppress login prompts for this request. Cached credentials or
// default credentials may still be used for authentication.
LOAD_FLAG(DO_NOT_PROMPT_FOR_LOGIN, 1 << 26)
+
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index d22cff7..36a1674 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -1127,7 +1127,7 @@ void URLRequestHttpJob::RecordTimer() {
to_start);
}
- const bool is_prerender = !!(request_info_.load_flags & LOAD_PRERENDER);
+ const bool is_prerender = !!(request_info_.load_flags & LOAD_PRERENDERING);
if (is_prerender) {
UMA_HISTOGRAM_MEDIUM_TIMES("Net.HttpTimeToFirstByte_Prerender",
to_start);