Changeset 72566 in webkit

Timestamp:

Nov 22, 2010 3:01:28 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-11-22 Charlie Reis <​creis@chromium.org>

Reviewed by Darin Fisher.

Update correct content state during back/forward navigations
​https://bugs.webkit.org/show_bug.cgi?id=48809

Test that we update content state when leaving a form in a subframe.

• fast/history/saves-state-after-frame-nav.html:
• fast/history/saves-state-after-frame-nav-expected.txt:
• fast/history/resources/subframe-with-form.html:

2010-11-22 Charlie Reis <​creis@chromium.org>

Reviewed by Darin Fisher.

Update correct content state during back/forward navigations
​https://bugs.webkit.org/show_bug.cgi?id=48809

Ensures that history's previousItem is non-null when clients try to
update content state (e.g., Chromium's UpdateSessionHistory). We now
track load completions with a boolean field rather than by clearing
previousItem.

Test: fast/history/saves-state-after-frame-nav.html

• loader/HistoryController.cpp:
• loader/HistoryController.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/history/resources/subframe-with-form.html (added)
• LayoutTests/fast/history/saves-state-after-frame-nav-expected.txt (added)
• LayoutTests/fast/history/saves-state-after-frame-nav.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/HistoryController.cpp (modified) (9 diffs)
• WebCore/loader/HistoryController.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-22  Charlie Reis  <creis@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Update correct content state during back/forward navigations
+        https://bugs.webkit.org/show_bug.cgi?id=48809
+
+        Test that we update content state when leaving a form in a subframe.
+
+        * fast/history/saves-state-after-frame-nav.html:
+        * fast/history/saves-state-after-frame-nav-expected.txt:
+        * fast/history/resources/subframe-with-form.html:
+
 2010-11-22  Julie Parent  <jparent@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-22  Charlie Reis  <creis@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Update correct content state during back/forward navigations
+        https://bugs.webkit.org/show_bug.cgi?id=48809
+
+        Ensures that history's previousItem is non-null when clients try to
+        update content state (e.g., Chromium's UpdateSessionHistory).  We now
+        track load completions with a boolean field rather than by clearing
+        previousItem.
+
+        Test: fast/history/saves-state-after-frame-nav.html
+
+        * loader/HistoryController.cpp:
+        * loader/HistoryController.h:
+
 2010-11-22  Luiz Agostini  <luiz.agostini@openbossa.org>
 

trunk/WebCore/loader/HistoryController.cpp

@@ -67 +67 @@
 HistoryController::HistoryController(Frame* frame)
     : m_frame(frame)
+    , m_frameLoadComplete(true)
 {
 }
@@ -139 +140 @@
 
     // Because of previousItem's "masking" of currentItem for this purpose, it's important
-    // that previousItem be cleared at the end of a page transition.  We leverage the
-    // checkLoadComplete recursion to achieve this goal.
-
-    HistoryItem* item = m_previousItem ? m_previousItem.get() : m_currentItem.get();
+    // that we keep track of the end of a page transition with m_frameLoadComplete.  We
+    // leverage the checkLoadComplete recursion to achieve this goal.
+
+    HistoryItem* item = m_frameLoadComplete ? m_currentItem.get() : m_previousItem.get();
     if (!item)
         return;
@@ -246 +247 @@
 
     // Must grab the current scroll position before disturbing it
-    saveScrollPositionAndViewStateToItem(m_previousItem.get());
+    if (!m_frameLoadComplete)
+        saveScrollPositionAndViewStateToItem(m_previousItem.get());
 }
 
@@ -393 +395 @@
         // Note previousItem must be set before we close the URL, which will
         // happen when the data source is made non-provisional below
+        m_frameLoadComplete = false;
         m_previousItem = m_currentItem;
         ASSERT(m_provisionalItem);
@@ -419 +422 @@
 {
     // Even if already complete, we might have set a previous item on a frame that
-    // didn't do any data loading on the past transaction. Make sure to clear these out.
-    m_previousItem = 0;
+    // didn't do any data loading on the past transaction. Make sure to track that
+    // the load is complete so that we use the current item instead.
+    m_frameLoadComplete = true;
 }
 
 void HistoryController::setCurrentItem(HistoryItem* item)
 {
+    m_frameLoadComplete = false;
+    m_previousItem = m_currentItem;
     m_currentItem = item;
 }
@@ -499 +505 @@
     
     // Set the item for which we will save document state
+    m_frameLoadComplete = false;
     m_previousItem = m_currentItem;
     m_currentItem = item;
@@ -508 +515 @@
 {
     RefPtr<HistoryItem> bfItem = createItem(m_frame->tree()->parent() ? true : false);
-    if (m_previousItem)
+    if (!m_frameLoadComplete)
         saveScrollPositionAndViewStateToItem(m_previousItem.get());
 
@@ -564 +571 @@
     {
         // This content is good, so leave it alone and look for children that need reloading
-        // Save form state (works from currentItem, since prevItem is nil)
-        ASSERT(!m_previousItem);
+        // Save form state (works from currentItem, since m_frameLoadComplete is true)
+        ASSERT(m_frameLoadComplete);
         saveDocumentState();
         saveScrollPositionAndViewStateToItem(m_currentItem.get());
@@ -572 +579 @@
             view->setWasScrolledByUser(false);
 
+        m_previousItem = m_currentItem;
         m_currentItem = item;
                 

trunk/WebCore/loader/HistoryController.h

@@ -97 +97 @@
     RefPtr<HistoryItem> m_previousItem;
     RefPtr<HistoryItem> m_provisionalItem;
+
+    bool m_frameLoadComplete;
 };