diff options
author | Leon Clarke <leonclarke@google.com> | 2010-07-13 04:14:52 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-13 04:14:52 -0700 |
commit | b72d3304e698fa5ca4ca89009283250d89a72268 (patch) | |
tree | 3afa22f71b3041f833533d623b55ad3524ce4df1 /LayoutTests | |
parent | 23e9dd818a876304304944c844be7625f63383c4 (diff) | |
parent | 5d6f8ef31d11ee66598999b1b749ba9ff767e4d5 (diff) | |
download | external_webkit-b72d3304e698fa5ca4ca89009283250d89a72268.zip external_webkit-b72d3304e698fa5ca4ca89009283250d89a72268.tar.gz external_webkit-b72d3304e698fa5ca4ca89009283250d89a72268.tar.bz2 |
Merge "Copy back the upstreamed version of prefetch https://bugs.webkit.org/show_bug.cgi?id=3652"
Diffstat (limited to 'LayoutTests')
8 files changed, 0 insertions, 152 deletions
diff --git a/LayoutTests/dom/html/level2/html/HTMLLinkElement10-expected.txt b/LayoutTests/dom/html/level2/html/HTMLLinkElement10-expected.txt deleted file mode 100644 index 6f009e8..0000000 --- a/LayoutTests/dom/html/level2/html/HTMLLinkElement10-expected.txt +++ /dev/null @@ -1,2 +0,0 @@ -Test: http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLLinkElement10 -Status: Success diff --git a/LayoutTests/dom/html/level2/html/HTMLLinkElement10-link.file b/LayoutTests/dom/html/level2/html/HTMLLinkElement10-link.file deleted file mode 100644 index 4a94b89..0000000 --- a/LayoutTests/dom/html/level2/html/HTMLLinkElement10-link.file +++ /dev/null @@ -1,12 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML> -<HEAD> -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=utf-8"> -<TITLE>NIST DOM HTML Test - LINK</TITLE> -<BODY> -<P> -This is the test link that's pre-fetched by the prefetch test. -</P> -</BODY> -</HTML> - diff --git a/LayoutTests/dom/html/level2/html/HTMLLinkElement10.html b/LayoutTests/dom/html/level2/html/HTMLLinkElement10.html deleted file mode 100644 index dcf20e1..0000000 --- a/LayoutTests/dom/html/level2/html/HTMLLinkElement10.html +++ /dev/null @@ -1,18 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML> -<HEAD> -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=utf-8"> -<TITLE>NIST DOM HTML Test - LINK</TITLE> -<script charset='UTF-8' type='text/javascript' src='selfhtml.js'></script> -<script charset='UTF-8' type='text/javascript' src='HTMLLinkElement10.js'></script> -<LINK CHARSET="Latin-1" HREF="HTMLLinkElement10-link.file" HREFLANG="en" MEDIA="screen" REL="prefetch" TYPE="text/html" onload="prefetchComplete()"> -<LINK CHARSET="Latin-1" HREF="./files/style1.css" HREFLANG="en" MEDIA="screen" REV="stylesheet" TYPE="text/css"> -<script type='text/javascript'>startTest10(); -</script></HEAD> -<BODY onload="loadComplete()"> -<P> -<BR> -</P> -</BODY> -</HTML> - diff --git a/LayoutTests/dom/html/level2/html/HTMLLinkElement10.js b/LayoutTests/dom/html/level2/html/HTMLLinkElement10.js deleted file mode 100644 index c0ac4a7..0000000 --- a/LayoutTests/dom/html/level2/html/HTMLLinkElement10.js +++ /dev/null @@ -1,51 +0,0 @@ - - - /** - * Gets URI that identifies the test. - * @return uri identifier of test - */ -function getTargetURI() { - return "http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLLinkElement10"; - } - -var docsLoaded = 0; -var mainLoaded = false; -var prefetchLoaded = false; - -function finishTest() { - if (mainLoaded && prefetchLoaded) { - setResult(null, null); - } else { - if (!prefetchLoaded) { - setResult("fail", "No prefetch onload fired"); - } else { - setResult("fail", "Prefetch fired, but maybe the document onload didn't"); - } - } - if (window.layoutTestController) { - layoutTestController.notifyDone(); - } -} - -function loadComplete() { - mainLoaded = true; - if (++docsLoaded == 2) { - finishTest(); - } -} - -function prefetchComplete() { - prefetchLoaded = true; - if (++docsLoaded == 2) { - finishTest(); - } -} - - - -function startTest10() { - if (window.layoutTestController) { - layoutTestController.dumpAsText(); - layoutTestController.waitUntilDone(); - } -} diff --git a/LayoutTests/dom/html/level2/html/HTMLLinkElement11-expected.txt b/LayoutTests/dom/html/level2/html/HTMLLinkElement11-expected.txt deleted file mode 100644 index d53710a..0000000 --- a/LayoutTests/dom/html/level2/html/HTMLLinkElement11-expected.txt +++ /dev/null @@ -1,2 +0,0 @@ -Test: http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLLinkElement11 -Status: Success diff --git a/LayoutTests/dom/html/level2/html/HTMLLinkElement11.css b/LayoutTests/dom/html/level2/html/HTMLLinkElement11.css deleted file mode 100644 index 6a5dab8..0000000 --- a/LayoutTests/dom/html/level2/html/HTMLLinkElement11.css +++ /dev/null @@ -1 +0,0 @@ -div { font-family: Arial, Helvetica, sans-serif; color: red; } diff --git a/LayoutTests/dom/html/level2/html/HTMLLinkElement11.html b/LayoutTests/dom/html/level2/html/HTMLLinkElement11.html deleted file mode 100644 index 9b9a5e4..0000000 --- a/LayoutTests/dom/html/level2/html/HTMLLinkElement11.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML> -<HEAD> -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=utf-8"> -<TITLE>NIST DOM HTML Test - LINK</TITLE> -<script charset='UTF-8' type='text/javascript' src='selfhtml.js'></script> -<script charset='UTF-8' type='text/javascript' src='HTMLLinkElement11.js'></script><script type='text/javascript'>startTest11();</script></HEAD> -<LINK CHARSET="Latin-1" HREF="HTMLLinkElement11.css" HREFLANG="en" MEDIA="screen" REL="stylesheet" TYPE="text/css" onload="cssComplete()"> -<BODY onload="loadComplete()"> -<P> -<BR> -</P> -</BODY> -</HTML> - diff --git a/LayoutTests/dom/html/level2/html/HTMLLinkElement11.js b/LayoutTests/dom/html/level2/html/HTMLLinkElement11.js deleted file mode 100644 index b8bf1cb..0000000 --- a/LayoutTests/dom/html/level2/html/HTMLLinkElement11.js +++ /dev/null @@ -1,51 +0,0 @@ - - - /** - * Gets URI that identifies the test. - * @return uri identifier of test - */ -function getTargetURI() { - return "http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLLinkElement11"; - } - -var docsLoaded = 0; -var mainLoaded = false; -var cssLoaded = false; - -function finishTest() { - if (mainLoaded && cssLoaded) { - setResult(null, null); - } else { - if (!cssLoaded) { - setResult("fail", "No css onload fired"); - } else { - setResult("fail", "Css fired, but maybe the document onload didn't"); - } - } - if (window.layoutTestController) { - layoutTestController.notifyDone(); - } -} - -function loadComplete() { - mainLoaded = true; - if (++docsLoaded == 2) { - finishTest(); - } -} - -function cssComplete() { - cssLoaded = true; - if (++docsLoaded == 2) { - finishTest(); - } -} - - - -function startTest11() { - if (window.layoutTestController) { - layoutTestController.dumpAsText(); - layoutTestController.waitUntilDone(); - } -} |