Changeset 27986 in webkit

Timestamp:

Nov 23, 2007, 2:19:17 AM (18 years ago)

Author:

ap@webkit.org

Message:

Reviewed by Maciej.

<rdar://problem/5539306> REGRESSION: redirect fails when subframe's document is opened but
not closed (affects digg.com)

Tests: fast/loader/meta-refresh-vs-open.html

fast/loader/redirect-with-open-subframe-2.html
fast/loader/redirect-with-open-subframe.html
http/tests/loading/onload-vs-immediate-refresh.pl

• loader/FrameLoader.cpp: (WebCore::FrameLoader::scheduleRedirection): Only check whether the load is complete for HTTP redirects - JavaScript-initiated ones are effective immediately.

WebKitTools:

• DumpRenderTree/mac/DumpRenderTree.mm: (runTest): Replace the current document with a blank one after finishing with a test to avoid having its delayed onload handler fired when starting the next test. This is ugly and still unreliable (see LayoutTests ChangeLog), but it helps somewhat.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/loader/meta-refresh-vs-open-expected.txt (added)
• LayoutTests/fast/loader/meta-refresh-vs-open.html (added)
• LayoutTests/fast/loader/redirect-with-open-subframe-2-expected.txt (added)
• LayoutTests/fast/loader/redirect-with-open-subframe-2.html (added)
• LayoutTests/fast/loader/redirect-with-open-subframe-expected.txt (added)
• LayoutTests/fast/loader/redirect-with-open-subframe.html (added)
• LayoutTests/http/tests/loading/onload-vs-immediate-refresh-expected.txt (added)
• LayoutTests/http/tests/loading/onload-vs-immediate-refresh.pl (added)
• LayoutTests/platform/mac/http/tests/loading/simple-subframe-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-11-23  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Maciej.
+
+        <rdar://problem/5539306> REGRESSION: redirect fails when subframe's document is opened but
+        not closed (affects digg.com)
+
+        * fast/loader/meta-refresh-vs-open-expected.txt: Added.
+        * fast/loader/meta-refresh-vs-open.html: Added.
+        Test that HTTP refresh never fires if the document stays open indefinitely.
+
+        * fast/loader/redirect-with-open-subframe-expected.txt: Added.
+        * fast/loader/redirect-with-open-subframe.html: Added.
+        * fast/loader/redirect-with-open-subframe-2-expected.txt: Added.
+        * fast/loader/redirect-with-open-subframe-2.html: Added.
+        Test that setting window.location has effect even if the document is open.
+
+        * http/tests/loading/onload-vs-immediate-refresh-expected.txt: Added.
+        * http/tests/loading/onload-vs-immediate-refresh.pl: Added.
+        Test for <rdar://3829452> - HTTP redirect should only happen after onload fires.
+
+        * platform/mac/http/tests/loading/simple-subframe-expected.txt:
+        It seems that there was a line spilled from the previous test that is now in
+        onload-vs-immediate-refresh-expected.txt - despite my efforts, I couldn't get rid of it.
+
 2007-11-23  Dan Bernstein  <mitz@apple.com>
 

trunk/LayoutTests/platform/mac/http/tests/loading/simple-subframe-expected.txt

@@ -1 +1 @@
 main frame - didStartProvisionalLoadForFrame
-frame "f1" - willCloseFrame
 main frame - willCloseFrame
 main frame - didCommitLoadForFrame

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-11-23  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Maciej.
+
+        <rdar://problem/5539306> REGRESSION: redirect fails when subframe's document is opened but
+        not closed (affects digg.com)
+
+        Tests: fast/loader/meta-refresh-vs-open.html
+               fast/loader/redirect-with-open-subframe-2.html
+               fast/loader/redirect-with-open-subframe.html
+               http/tests/loading/onload-vs-immediate-refresh.pl
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::scheduleRedirection): Only check whether the load is complete for
+        HTTP redirects - JavaScript-initiated ones are effective immediately.
+
 2007-11-23  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -1809 +1809 @@
     stopRedirectionTimer();
     m_scheduledRedirection.set(redirection);
-    if (m_isComplete)
+    if (!m_isComplete && redirection->type != ScheduledRedirection::redirection)
+        completed();
+    if (m_isComplete || redirection->type != ScheduledRedirection::redirection)
         startRedirectionTimer();
 }

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-11-23  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Maciej.
+
+        <rdar://problem/5539306> REGRESSION: redirect fails when subframe's document is opened but
+        not closed (affects digg.com)
+
+        * DumpRenderTree/mac/DumpRenderTree.mm: (runTest): Replace the current document with a blank
+        one after finishing with a test to avoid having its delayed onload handler firing when
+        replaced with the next one. This is ugly and still unreliable (see LayoutTests ChangeLog),
+        but it helps somewhat.
+
 2007-11-22  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -875 +875 @@
     }
     
+    [mainFrame loadHTMLString:@"<html></html>" baseURL:[NSURL URLWithString:@"about:blank"]];
+    [mainFrame stopLoading];
+    
     [pool release];