Changeset 109480 in webkit

Timestamp:

Mar 1, 2012 6:29:59 PM (12 years ago)

Author:

tkent@chromium.org

Message:

REGRESSION(r106388): Form state is restored to a wrong document.
​https://bugs.webkit.org/show_bug.cgi?id=79206

Reviewed by Brady Eidson.

Source/WebCore:

In some cases, the URL of the current HistoryItem and the document
URL are mismatched.
A form state should be restored only if the document was loaded
with a HistoryItem and the document is not loaded as a
redirection.

Test: fast/loader/form-state-restore-with-locked-back-forward-list.html

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::checkCompleted): Clear m_requestedHistoryItem.
(WebCore::FrameLoader::loadItem):
Save the requested HistoryItem for didLoadWithLodItem().

• loader/FrameLoader.h:

(WebCore::FrameLoader::requestedHistoryItem):
Added. Accessor for m_requestedHistoryItem.

• loader/HistoryController.cpp:

(WebCore::HistoryController::restoreDocumentState):
Restore a form state only if the current document was loaded with
FrameLoader::loadItem() and not redirection.

LayoutTests:

• fast/loader/form-state-restore-with-locked-back-forward-list-expected.txt: Added.
• fast/loader/form-state-restore-with-locked-back-forward-list.html: Added.
• fast/loader/resources/form-state-restore-with-locked-back-forward-list-2.html: Added.
• fast/loader/resources/form-state-restore-with-locked-back-forward-list-3.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/loader/form-state-restore-with-locked-back-forward-list-expected.txt (added)
• LayoutTests/fast/loader/form-state-restore-with-locked-back-forward-list.html (added)
• LayoutTests/fast/loader/resources/form-state-restore-with-locked-back-forward-list-2.html (added)
• LayoutTests/fast/loader/resources/form-state-restore-with-locked-back-forward-list-3.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (2 diffs)
• Source/WebCore/loader/FrameLoader.h (modified) (2 diffs)
• Source/WebCore/loader/HistoryController.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-01  Kent Tamura  <tkent@chromium.org>
+
+        REGRESSION(r106388): Form state is restored to a wrong document.
+        https://bugs.webkit.org/show_bug.cgi?id=79206
+
+        Reviewed by Brady Eidson.
+
+        * fast/loader/form-state-restore-with-locked-back-forward-list-expected.txt: Added.
+        * fast/loader/form-state-restore-with-locked-back-forward-list.html: Added.
+        * fast/loader/resources/form-state-restore-with-locked-back-forward-list-2.html: Added.
+        * fast/loader/resources/form-state-restore-with-locked-back-forward-list-3.html: Added.
+
 2012-03-01  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-01  Kent Tamura  <tkent@chromium.org>
+
+        REGRESSION(r106388): Form state is restored to a wrong document.
+        https://bugs.webkit.org/show_bug.cgi?id=79206
+
+        Reviewed by Brady Eidson.
+
+        In some cases, the URL of the current HistoryItem and the document
+        URL are mismatched.
+        A form state should be restored only if the document was loaded
+        with a HistoryItem and the document is not loaded as a
+        redirection.
+
+        Test: fast/loader/form-state-restore-with-locked-back-forward-list.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::checkCompleted): Clear m_requestedHistoryItem.
+        (WebCore::FrameLoader::loadItem):
+        Save the requested HistoryItem for didLoadWithLodItem().
+        * loader/FrameLoader.h:
+        (WebCore::FrameLoader::requestedHistoryItem):
+        Added. Accessor for m_requestedHistoryItem.
+        * loader/HistoryController.cpp:
+        (WebCore::HistoryController::restoreDocumentState):
+        Restore a form state only if the current document was loaded with
+        FrameLoader::loadItem() and not redirection.
+
 2012-03-01  Xingnan Wang  <xingnan.wang@intel.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -739 +739 @@
     // OK, completed.
     m_isComplete = true;
+    m_requestedHistoryItem = 0;
     m_frame->document()->setReadyState(Document::Complete);
 
@@ -3174 +3175 @@
 void FrameLoader::loadItem(HistoryItem* item, FrameLoadType loadType)
 {
+    m_requestedHistoryItem = item;
     HistoryItem* currentItem = history()->currentItem();
     bool sameDocumentNavigation = currentItem && item->shouldDoSameDocumentNavigationTo(currentItem);

trunk/Source/WebCore/loader/FrameLoader.h

@@ -120 +120 @@
     void open(CachedFrameBase&);
     void loadItem(HistoryItem*, FrameLoadType);
+    HistoryItem* requestedHistoryItem() const { return m_requestedHistoryItem.get(); }
 
     static void reportLocalLoadFailed(Frame*, const String& url);
@@ -438 +439 @@
 
     KURL m_previousUrl;
+    RefPtr<HistoryItem> m_requestedHistoryItem;
 };
 

trunk/Source/WebCore/loader/HistoryController.cpp

@@ -201 +201 @@
     if (!itemToRestore)
         return;
-
-    LOG(Loading, "WebCoreLoading %s: restoring form state from %p", m_frame->tree()->uniqueName().string().utf8().data(), itemToRestore);
-    doc->setStateForNewFormElements(itemToRestore->documentState());
+    if (m_frame->loader()->requestedHistoryItem() == m_currentItem.get() && !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());
+    }
 }