Changeset 50111 in webkit

Timestamp:

Oct 26, 2009 4:20:25 PM (15 years ago)

Author:

beidson@apple.com

Message:

<rdar://problem/7308952> and ​http://webkit.org/b/30424 - REGRESSION (r48687): Pages on ucas.com appear blank.

Reviewed by Darin Adler.

WebCore:

Test: fast/loader/history-forward-in-head.html

• loader/RedirectScheduler.cpp:

(WebCore::RedirectScheduler::scheduleHistoryNavigation): Restore the moved canGoBackOrForward() check.

This restores the side effect of an invalid history navigation canceling previous scheduled redirects
and also fixes the bug of scheduling an invalid history navigation canceling parsing of the current document.

(WebCore::RedirectScheduler::timerFired): Removed the canGoBackOrForward() check as it is now made before

the redirect is scheduled.

LayoutTests:

• fast/loader/history-forward-in-head-expected.txt: Added.
• fast/loader/history-forward-in-head.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/loader/history-forward-in-head-expected.txt (added)
• LayoutTests/fast/loader/history-forward-in-head.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/RedirectScheduler.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-10-26  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/7308952> and http://webkit.org/b/30424 - REGRESSION (r48687): Pages on ucas.com appear blank.
+
+        * fast/loader/history-forward-in-head-expected.txt: Added.
+        * fast/loader/history-forward-in-head.html: Added.
+
 2009-10-26  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-26  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/7308952> and http://webkit.org/b/30424 - REGRESSION (r48687): Pages on ucas.com appear blank.
+
+        Test: fast/loader/history-forward-in-head.html
+
+        * loader/RedirectScheduler.cpp:
+        (WebCore::RedirectScheduler::scheduleHistoryNavigation): Restore the moved canGoBackOrForward() check.
+          This restores the side effect of an invalid history navigation canceling previous scheduled redirects
+          and also fixes the bug of scheduling an invalid history navigation canceling parsing of the current document.
+        (WebCore::RedirectScheduler::timerFired): Removed the canGoBackOrForward() check as it is now made before
+          the redirect is scheduled.
+
 2009-10-26  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebCore/loader/RedirectScheduler.cpp

@@ -256 +256 @@
         return;
 
+    // Invalid history navigations (such as history.forward() during a new load) have the side effect of cancelling any scheduled
+    // redirects. We also avoid the possibility of cancelling the current load by avoiding the scheduled redirection altogether.
+    if (!m_frame->page()->canGoBackOrForward(steps)) { 
+        cancel(); 
+        return; 
+    } 
+
     schedule(new ScheduledRedirection(steps));
 }
@@ -283 +290 @@
             // go(i!=0) from a frame navigates into the history of the frame only,
             // in both IE and NS (but not in Mozilla). We can't easily do that.
-            if (m_frame->page()->canGoBackOrForward(redirection->historySteps))
-                m_frame->page()->goBackOrForward(redirection->historySteps);
+            m_frame->page()->goBackOrForward(redirection->historySteps);
             return;
         case ScheduledRedirection::formSubmission: