2010-11-02 Jenn Braithwaite <jennb@chromium.org>

        Reviewed by Andreas Kling.

        fast/frames/iframe-reparenting-new-page.html output is ordered wrong
        https://bugs.webkit.org/show_bug.cgi?id=48807

        * fast/frames/iframe-reparenting-new-page-expected.txt:
        * fast/frames/script-tests/iframe-reparenting-new-page.js:
        (finish):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@71166 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1748035..4d1b516 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-02  Jenn Braithwaite  <jennb@chromium.org>
+
+        Reviewed by Andreas Kling.
+
+        fast/frames/iframe-reparenting-new-page.html output is ordered wrong
+        https://bugs.webkit.org/show_bug.cgi?id=48807
+
+        * fast/frames/iframe-reparenting-new-page-expected.txt:
+        * fast/frames/script-tests/iframe-reparenting-new-page.js:
+        (finish):
+
 2010-10-28  Zhenyao Mo  <zmo@google.com>
 
         Reviewed by Kenneth Russell.

diff --git a/LayoutTests/fast/frames/iframe-reparenting-new-page-expected.txt b/LayoutTests/fast/frames/iframe-reparenting-new-page-expected.txt
index 02172a4..630eff4 100644 (file)
--- a/LayoutTests/fast/frames/iframe-reparenting-new-page-expected.txt
+++ b/LayoutTests/fast/frames/iframe-reparenting-new-page-expected.txt
@@ -3,9 +3,6 @@ The test verifies that the timer in iframe continues firing after iframe is adop
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS successfullyParsed is true
-
-TEST COMPLETE
 PASS Loaded iframe in window 1.
 PASS iframe.contentWindow.counter is 1
 PASS Loaded page 2.
@@ -15,4 +12,7 @@ PASS iframe.contentWindow.counter is 2
 PASS window2.location.href is iframe.contentWindow.parent.location.href
 PASS Page 1 is closed.
 PASS Received the timer beat from the adopted iframe - exiting.
+PASS successfullyParsed is true
+
+TEST COMPLETE
 

diff --git a/LayoutTests/fast/frames/script-tests/iframe-reparenting-new-page.js b/LayoutTests/fast/frames/script-tests/iframe-reparenting-new-page.js
index 7e2d7d2..f971484 100644 (file)
--- a/LayoutTests/fast/frames/script-tests/iframe-reparenting-new-page.js
+++ b/LayoutTests/fast/frames/script-tests/iframe-reparenting-new-page.js
@@ -12,8 +12,7 @@ function finish()
 
     testPassed("Received the timer beat from the adopted iframe - exiting.")
     window2.close();
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    finishJSTest();
 }
 
 function page1Unloaded()
@@ -52,4 +51,5 @@ if (window.layoutTestController) {
 window1 = window.open("resources/iframe-reparenting-new-page-1.html", "_blank");
 window1.addEventListener("load", window1Loaded, false);
 
+var jsTestIsAsync = true;
 var successfullyParsed = true;