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 Canonical link: https://commits.webkit.org/199198@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229496 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Mar 10, 2018 · a24280c4adaaa7461e07d2eb86458d9aaebee44f · a24280c
1 parent 7d5dcb3
commit a24280c4adaaa7461e07d2eb86458d9aaebee44f
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2018-03-09  Ryan Haddad  <ryanhaddad@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  <youenn@apple.com>
 
         ServiceWorker should respect IDB and DOMCache partitioning

diff --git a/...utTests/http/tests/security/frame-loading-via-document-write-async-delegates-expected.txt b/...utTests/http/tests/security/frame-loading-via-document-write-async-delegates-expected.txt
diff --git a/LayoutTests/http/tests/security/frame-loading-via-document-write-async-delegates.html b/LayoutTests/http/tests/security/frame-loading-via-document-write-async-delegates.html
diff --git a/LayoutTests/http/tests/security/frame-loading-via-document-write.html b/LayoutTests/http/tests/security/frame-loading-via-document-write.html
@@ -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=\"resources/frame-loading-via-document-write.js\">"+
-              "</scr" + "ipt></head><body onLoad=\"didImageLoad()\"><table><tr><td>"+
+              "</scr" + "ipt></head><body onLoad=\"lastTest()\"><table><tr><td>"+
               "<div id=\"result\"></div>"+
               "<img src=\"/resources/abe.png\" id=\"myImg\">"+
               "</td></tr></table></body></html>";

diff --git a/LayoutTests/http/tests/security/resources/frame-loading-via-document-write.js b/LayoutTests/http/tests/security/resources/frame-loading-via-document-write.js
@@ -17,3 +17,11 @@ function didImageLoad()
     }
 }
 
+function lastTest()
+{
+    didImageLoad();
+
+    if (window.testRunner)
+        testRunner.notifyDone();
+}
+