Changeset 127221 in webkit

Timestamp:

Aug 30, 2012, 6:14:53 PM (14 years ago)

Author:

tkent@chromium.org

Message:

Merge 126839 - REGRESSION(r109480): Form state for iframe content is not restored
​https://bugs.webkit.org/show_bug.cgi?id=90870

Reviewed by Jochen Eisinger.

Source/WebCore:

Since r109480, we have restored form state only for documents
loaded by FrameLoader::loadItem(). However we should restore form
state for documents in sub-frames of documents loaded by
FrameLoader::loadItem().

Test: fast/loader/form-state-restore-with-frames.html

• history/HistoryItem.cpp:

(WebCore::HistoryItem::isAncestorOf):
Added. A function to search descendants for the specified
HistoryItem. This is used by isAssociatedToRequestedHistoryItem().

• history/HistoryItem.h:

(HistoryItem): Declare isAncestorOf().

• loader/HistoryController.cpp:

(WebCore::HistoryController::saveDocumentState):
Don't save form state for detached document.
This is needed because saveDocumentState() is called twice; before
document detach and after document detach. We need to avoid the
latter call because formElementsState() for a detached document
produces an empty state.
(WebCore::isAssociatedToRequestedHistoryItem):
Added. This function checks the current HistoryItem is associated
to the HistoryItem specified to FrameLoader::loadItem().
(WebCore::HistoryController::restoreDocumentState):
Uses isAssociatedToRequestedHistoryItem().

LayoutTests:

• fast/loader/form-state-restore-with-frames.html: Added.
• fast/loader/form-state-restore-with-frames-expected.txt: Added.
• fast/loader/resources/form-state-restore-with-frames-1.html: Added.

TBR=​tkent@chromium.org
Review URL: ​https://chromiumcodereview.appspot.com/10918017

Location:

branches/chromium/1229

Files:

• LayoutTests/fast/loader/form-state-restore-with-frames-expected.txt (copied) (copied from trunk/LayoutTests/fast/loader/form-state-restore-with-frames-expected.txt )
• LayoutTests/fast/loader/form-state-restore-with-frames.html (copied) (copied from trunk/LayoutTests/fast/loader/form-state-restore-with-frames.html )
• LayoutTests/fast/loader/resources/form-state-restore-with-frames-1.html (copied) (copied from trunk/LayoutTests/fast/loader/resources/form-state-restore-with-frames-1.html )
• Source/WebCore/history/HistoryItem.cpp (modified) (1 diff)
• Source/WebCore/history/HistoryItem.h (modified) (1 diff)
• Source/WebCore/loader/HistoryController.cpp (modified) (3 diffs)

branches/chromium/1229/Source/WebCore/history/HistoryItem.cpp

@@ -533 +533 @@
 }
 
+bool HistoryItem::isAncestorOf(const HistoryItem* item) const
+{
+    for (size_t i = 0; i < m_children.size(); ++i) {
+        HistoryItem* child = m_children[i].get();
+        if (child == item)
+            return true;
+        if (child->isAncestorOf(item))
+            return true;
+    }
+    return false;
+}
+
 // We do same-document navigation if going to a different item and if either of the following is true:
 // - The other item corresponds to the same document (for history entries created via pushState or fragment changes).

branches/chromium/1229/Source/WebCore/history/HistoryItem.h

@@ -172 +172 @@
     bool hasChildren() const;
     void clearChildren();
+    bool isAncestorOf(const HistoryItem*) const;
     
     bool shouldDoSameDocumentNavigationTo(HistoryItem* otherItem) const;

branches/chromium/1229/Source/WebCore/loader/HistoryController.cpp

@@ -164 +164 @@
     ASSERT(document);
     
-    if (item->isCurrentDocument(document)) {
+    if (item->isCurrentDocument(document) && document->attached()) {
         LOG(Loading, "WebCoreLoading %s: saving form state to %p", m_frame->tree()->uniqueName().string().utf8().data(), item);
         item->setDocumentState(document->formElementsState());
@@ -178 +178 @@
         frame->loader()->history()->saveScrollPositionAndViewStateToItem(frame->loader()->history()->currentItem());
     }
+}
+
+static inline bool isAssociatedToRequestedHistoryItem(const HistoryItem* current, Frame* frame, const HistoryItem* requested)
+{
+    if (requested == current)
+        return true;
+    if (requested)
+        return false;
+    while ((frame = frame->tree()->parent())) {
+        requested = frame->loader()->requestedHistoryItem();
+        if (!requested)
+            continue;
+        if (requested->isAncestorOf(current))
+            return true;
+    }
+    return false;
 }
 
@@ -202 +218 @@
     if (!itemToRestore)
         return;
-    if (m_frame->loader()->requestedHistoryItem() == m_currentItem.get() && !m_frame->loader()->documentLoader()->isClientRedirect()) {
+    if (isAssociatedToRequestedHistoryItem(itemToRestore, m_frame, m_frame->loader()->requestedHistoryItem()) && !m_frame->loader()->documentLoader()->isClientRedirect()) {
         LOG(Loading, "WebCoreLoading %s: restoring form state from %p", m_frame->tree()->uniqueName().string().utf8().data(), itemToRestore);
         doc->setStateForNewFormElements(itemToRestore->documentState());