summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authordominich@google.com <dominich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-23 17:10:32 +0000
committerdominich@google.com <dominich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-23 17:10:32 +0000
commit55e98aa030c064bf18ef7b203d13597ebdc0cbf2 (patch)
treeaa40b0962ee8087617470d5b8faa7a5041304336 /chrome/test
parent5cae17e22107d328e567ba3f877607e6181dcf20 (diff)
downloadchromium_src-55e98aa030c064bf18ef7b203d13597ebdc0cbf2.zip
chromium_src-55e98aa030c064bf18ef7b203d13597ebdc0cbf2.tar.gz
chromium_src-55e98aa030c064bf18ef7b203d13597ebdc0cbf2.tar.bz2
Add pending preloads indexed by routing id. Start preloading once we navigate.
BUG=72519 TEST=Create a page A that has a <link rel=prefetch> hint for another page B. In page B, add a <link rel=prefetch> hint for page A. Visit A and observe the prefetch for A only starts on navigation to B. Review URL: http://codereview.chromium.org/6625066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/prerender/prerender_infinite_a_multiple.html22
-rw-r--r--chrome/test/data/prerender/prerender_infinite_b.html12
-rw-r--r--chrome/test/data/prerender/prerender_infinite_b_multiple.html8
-rw-r--r--chrome/test/data/prerender/prerender_infinite_c_multiple.html8
4 files changed, 38 insertions, 12 deletions
diff --git a/chrome/test/data/prerender/prerender_infinite_a_multiple.html b/chrome/test/data/prerender/prerender_infinite_a_multiple.html
new file mode 100644
index 0000000..f9fcf88
--- /dev/null
+++ b/chrome/test/data/prerender/prerender_infinite_a_multiple.html
@@ -0,0 +1,22 @@
+<html>
+ <head>
+ <script>
+ var pageWasPrerendered = false;
+
+ function DidPrerenderPass() {
+ pageWasPrerendered = true;
+ return true;
+ }
+
+ function DidDisplayPass() {
+ return pageWasPrerendered;
+ }
+ </script>
+ </head>
+ <body>
+ <link rel="prefetch" href="prerender_infinite_b_multiple.html">
+ <a href="prerender_infinite_b_multiple.html">B</a>
+ <link rel="prefetch" href="prerender_infinite_c_multiple.html">
+ <a href="prerender_infinite_c_multiple.html">C</a>
+ </body>
+</html>
diff --git a/chrome/test/data/prerender/prerender_infinite_b.html b/chrome/test/data/prerender/prerender_infinite_b.html
index a3ac7ca..d485ae6 100644
--- a/chrome/test/data/prerender/prerender_infinite_b.html
+++ b/chrome/test/data/prerender/prerender_infinite_b.html
@@ -1,17 +1,5 @@
<html>
<head>
- <script>
- var pageWasPrerendered = false;
-
- function DidPrerenderPass() {
- pageWasPrerendered = true;
- return true;
- }
-
- function DidDisplayPass() {
- return pageWasPrerendered;
- }
- </script>
</head>
<body>
<link rel="prefetch" href="prerender_infinite_a.html">
diff --git a/chrome/test/data/prerender/prerender_infinite_b_multiple.html b/chrome/test/data/prerender/prerender_infinite_b_multiple.html
new file mode 100644
index 0000000..1699b40
--- /dev/null
+++ b/chrome/test/data/prerender/prerender_infinite_b_multiple.html
@@ -0,0 +1,8 @@
+<html>
+ <head>
+ </head>
+ <body>
+ <link rel="prefetch" href="prerender_infinite_a_multiple.html">
+ <a href="prerender_infinite_a_multiple.html">A</a>
+ </body>
+</html>
diff --git a/chrome/test/data/prerender/prerender_infinite_c_multiple.html b/chrome/test/data/prerender/prerender_infinite_c_multiple.html
new file mode 100644
index 0000000..1699b40
--- /dev/null
+++ b/chrome/test/data/prerender/prerender_infinite_c_multiple.html
@@ -0,0 +1,8 @@
+<html>
+ <head>
+ </head>
+ <body>
+ <link rel="prefetch" href="prerender_infinite_a_multiple.html">
+ <a href="prerender_infinite_a_multiple.html">A</a>
+ </body>
+</html>