Title: [229496] trunk/LayoutTests
- Revision
- 229496
- Author
- ryanhad...@apple.com
- Date
- 2018-03-09 17:28:07 -0800 (Fri, 09 Mar 2018)
Log Message
Unreviewed, rolling out r229468.
This change caused http/tests/security/frame-loading-via-
document-write.html to fail.
Reverted changeset:
"http/tests/security/frame-loading-via-document-write-async-
delegates.html fails with async delegates"
https://bugs.webkit.org/show_bug.cgi?id=183460
https://trac.webkit.org/changeset/229468
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (229495 => 229496)
--- trunk/LayoutTests/ChangeLog 2018-03-10 01:24:24 UTC (rev 229495)
+++ trunk/LayoutTests/ChangeLog 2018-03-10 01:28:07 UTC (rev 229496)
@@ -1,3 +1,17 @@
+2018-03-09 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r229468.
+
+ This change caused http/tests/security/frame-loading-via-
+ document-write.html to fail.
+
+ Reverted changeset:
+
+ "http/tests/security/frame-loading-via-document-write-async-
+ delegates.html fails with async delegates"
+ https://bugs.webkit.org/show_bug.cgi?id=183460
+ https://trac.webkit.org/changeset/229468
+
2018-03-09 Youenn Fablet <you...@apple.com>
ServiceWorker should respect IDB and DOMCache partitioning
Deleted: trunk/LayoutTests/http/tests/security/frame-loading-via-document-write-async-delegates-expected.txt (229495 => 229496)
--- trunk/LayoutTests/http/tests/security/frame-loading-via-document-write-async-delegates-expected.txt 2018-03-10 01:24:24 UTC (rev 229495)
+++ trunk/LayoutTests/http/tests/security/frame-loading-via-document-write-async-delegates-expected.txt 2018-03-10 01:28:07 UTC (rev 229496)
@@ -1,22 +0,0 @@
-CONSOLE MESSAGE: line 1: Not allowed to load local resource: abe.png
-
-
---------
-Frame: 'topRow'
---------
-This page was successfully loaded.
-My protocol is http:
-My referrer is blank
-
-
---------
-Frame: 'middleRow'
---------
-Image NOT loaded.
-
-
---------
-Frame: 'bottomRow'
---------
-Image loaded.
-
Deleted: trunk/LayoutTests/http/tests/security/frame-loading-via-document-write-async-delegates.html (229495 => 229496)
--- trunk/LayoutTests/http/tests/security/frame-loading-via-document-write-async-delegates.html 2018-03-10 01:24:24 UTC (rev 229495)
+++ trunk/LayoutTests/http/tests/security/frame-loading-via-document-write-async-delegates.html 2018-03-10 01:28:07 UTC (rev 229496)
@@ -1,82 +0,0 @@
-<html>
-<head>
-<title></title>
-
-<script language="_javascript_">
-
-const expectedLoadCount = 7;
-let loadCount = 0;
-function finishTestIfLastLoad()
-{
- if (++loadCount == expectedLoadCount && window.testRunner)
- testRunner.notifyDone();
-}
-
-function buildFrameset()
-{
- if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
- testRunner.dumpChildFramesAsText();
- if (testRunner.setShouldDecideNavigationPolicyAfterDelay)
- testRunner.setShouldDecideNavigationPolicyAfterDelay(true);
- }
-
- var outHTML="<frameset rows=\"33%, 33%, 33%\">"+
- "<frame src="" _onload_=\"finishTestIfLastLoad()\" name=\"topRow\">"+
- "<frame src="" _onload_=\"finishTestIfLastLoad()\" name=\"middleRow\">"+
- "<frame src="" _onload_=\"finishTestIfLastLoad()\" name=\"bottomRow\">"+
- "</frameset>";
-
- document.open("text/html","replace");
- document.write(outHTML);
- document.close();
-
- outHTML = "<html><head><scr" + "ipt language=\"_javascript_\" src=""
- "</scr" + "ipt></head><body _onLoad_=\"clickAnchor()\"><table><tr><td>"+
- "<a href="" target=\"topRow\" id=\"anchorLink\">Click me. If nothing loads above we have a problem.</a>"+
- "</td></tr></table></body></html>";
-
- frames['topRow'].document.open("text/html","replace");
- frames['topRow'].document.charset=document.charset;
- frames['topRow'].document.write(outHTML);
- frames['topRow'].document.close();
-
- var localImageLocation = "file:///tmp/LayoutTests/fast/dom/resources/abe.png";
- if (window.testRunner)
- localImageLocation = testRunner.pathToLocalResource(localImageLocation);
-
- outHTML = "<html><head><scr" + "ipt language=\"_javascript_\" src=""
- "</scr" + "ipt></head><body _onLoad_=\"didImageLoad()\"><table><tr><td>"+
- "<div id=\"result\"></div>"+
- "<img src="" + localImageLocation + "\" id=\"myImg\">"+
- "</td></tr></table></body></html>";
-
- frames['middleRow'].document.open("text/html","replace");
- frames['middleRow'].document.charset=document.charset;
- frames['middleRow'].document.write(outHTML);
- frames['middleRow'].document.close();
-
- outHTML = "<html><head><scr" + "ipt language=\"_javascript_\" src=""
- "</scr" + "ipt></head><body _onLoad_=\"didImageLoad()\"><table><tr><td>"+
- "<div id=\"result\"></div>"+
- "<img src="" id=\"myImg\">"+
- "</td></tr></table></body></html>";
-
- frames['bottomRow'].document.open("text/html","replace");
- frames['bottomRow'].document.charset=document.charset;
- frames['bottomRow'].document.write(outHTML);
- frames['bottomRow'].document.close();
-}
-
-buildFrameset();
-
-</script>
-</head>
-
-<body>
-<p>_javascript_ FAILED! you should not see this.</p>
-</body>
-
-</html>
-
Modified: trunk/LayoutTests/http/tests/security/frame-loading-via-document-write.html (229495 => 229496)
--- trunk/LayoutTests/http/tests/security/frame-loading-via-document-write.html 2018-03-10 01:24:24 UTC (rev 229495)
+++ trunk/LayoutTests/http/tests/security/frame-loading-via-document-write.html 2018-03-10 01:28:07 UTC (rev 229496)
@@ -4,14 +4,6 @@
<script language="_javascript_">
-const expectedLoadCount = 7;
-let loadCount = 0;
-function finishTestIfLastLoad()
-{
- if (++loadCount == expectedLoadCount && window.testRunner)
- testRunner.notifyDone();
-}
-
function buildFrameset()
{
if (window.testRunner) {
@@ -21,9 +13,9 @@
}
var outHTML="<frameset rows=\"33%, 33%, 33%\">"+
- "<frame src="" _onload_=\"finishTestIfLastLoad()\" name=\"topRow\">"+
- "<frame src="" _onload_=\"finishTestIfLastLoad()\" name=\"middleRow\">"+
- "<frame src="" _onload_=\"finishTestIfLastLoad()\" name=\"bottomRow\">"+
+ "<frame src="" name=\"topRow\">"+
+ "<frame src="" name=\"middleRow\">"+
+ "<frame src="" name=\"bottomRow\">"+
"</frameset>";
document.open("text/html","replace");
@@ -56,7 +48,7 @@
frames['middleRow'].document.close();
outHTML = "<html><head><scr" + "ipt language=\"_javascript_\" src=""
- "</scr" + "ipt></head><body _onLoad_=\"didImageLoad()\"><table><tr><td>"+
+ "</scr" + "ipt></head><body _onLoad_=\"lastTest()\"><table><tr><td>"+
"<div id=\"result\"></div>"+
"<img src="" id=\"myImg\">"+
"</td></tr></table></body></html>";
Modified: trunk/LayoutTests/http/tests/security/resources/frame-loading-via-document-write.js (229495 => 229496)
--- trunk/LayoutTests/http/tests/security/resources/frame-loading-via-document-write.js 2018-03-10 01:24:24 UTC (rev 229495)
+++ trunk/LayoutTests/http/tests/security/resources/frame-loading-via-document-write.js 2018-03-10 01:28:07 UTC (rev 229496)
@@ -17,3 +17,11 @@
}
}
+function lastTest()
+{
+ didImageLoad();
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
