From 5d6f8ef31d11ee66598999b1b749ba9ff767e4d5 Mon Sep 17 00:00:00 2001 From: Leon Clarke Date: Mon, 12 Jul 2010 16:00:49 +0100 Subject: Copy back the upstreamed version of prefetch https://bugs.webkit.org/show_bug.cgi?id=3652 Change-Id: Ibda522afed15e7581019a198e773785b7cad57ca --- .../level2/html/HTMLLinkElement10-expected.txt | 2 - .../html/level2/html/HTMLLinkElement10-link.file | 12 ----- .../dom/html/level2/html/HTMLLinkElement10.html | 18 -------- .../dom/html/level2/html/HTMLLinkElement10.js | 51 ---------------------- .../level2/html/HTMLLinkElement11-expected.txt | 2 - .../dom/html/level2/html/HTMLLinkElement11.css | 1 - .../dom/html/level2/html/HTMLLinkElement11.html | 15 ------- .../dom/html/level2/html/HTMLLinkElement11.js | 51 ---------------------- 8 files changed, 152 deletions(-) delete mode 100644 LayoutTests/dom/html/level2/html/HTMLLinkElement10-expected.txt delete mode 100644 LayoutTests/dom/html/level2/html/HTMLLinkElement10-link.file delete mode 100644 LayoutTests/dom/html/level2/html/HTMLLinkElement10.html delete mode 100644 LayoutTests/dom/html/level2/html/HTMLLinkElement10.js delete mode 100644 LayoutTests/dom/html/level2/html/HTMLLinkElement11-expected.txt delete mode 100644 LayoutTests/dom/html/level2/html/HTMLLinkElement11.css delete mode 100644 LayoutTests/dom/html/level2/html/HTMLLinkElement11.html delete mode 100644 LayoutTests/dom/html/level2/html/HTMLLinkElement11.js (limited to 'LayoutTests/dom') 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 @@ - - - - -NIST DOM HTML Test - LINK - -

-This is the test link that's pre-fetched by the prefetch test. -

- - - 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 @@ - - - - -NIST DOM HTML Test - LINK - - - - - - -

-
-

- - - 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 @@ - - - - -NIST DOM HTML Test - LINK - - - - -

-
-

- - - 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(); - } -} -- cgit v1.1