summaryrefslogtreecommitdiffstats
path: root/webkit
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 /webkit
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 'webkit')
-rw-r--r--webkit/glue/resource_type.h1
-rw-r--r--webkit/glue/weburlloader_impl.cc2
2 files changed, 3 insertions, 0 deletions
diff --git a/webkit/glue/resource_type.h b/webkit/glue/resource_type.h
index 224656a..e9ae3b6 100644
--- a/webkit/glue/resource_type.h
+++ b/webkit/glue/resource_type.h
@@ -23,6 +23,7 @@ class ResourceType {
WORKER, // the main resource of a dedicated worker.
SHARED_WORKER, // the main resource of a shared worker.
PREFETCH, // an explicitly requested prefetch
+ PRERENDER, // an explicitly requested prerender
FAVICON, // a favicon
LAST_TYPE // Place holder so we don't need to change ValidType
// everytime.
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index 0a874d0..dd5b20b 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -135,6 +135,8 @@ ResourceType::Type FromTargetType(WebURLRequest::TargetType type) {
return ResourceType::SHARED_WORKER;
case WebURLRequest::TargetIsPrefetch:
return ResourceType::PREFETCH;
+ case WebURLRequest::TargetIsPrerender:
+ return ResourceType::PRERENDER;
case WebURLRequest::TargetIsFavicon:
return ResourceType::FAVICON;
default: