Changeset 21738 in webkit

Timestamp:

May 24, 2007 4:48:02 PM (17 years ago)

Author:

adele

Message:

LayoutTests:

Reviewed by Darin.

Test for <rdar://problem/5211921> Form values sometimes get transposed (iGoogle)

• fast/history/redirect-load-no-form-restoration-expected.txt: Added.
• fast/history/redirect-load-no-form-restoration.html: Added.
• fast/history/resources/redirect-load.html: Added.

WebCore:

Reviewed by Darin.

Fix for <rdar://problem/5211921> Form values sometimes get transposed (iGoogle)

Test: fast/history/redirect-load-no-form-restoration.html

• history/HistoryItem.cpp: (WebCore::HistoryItem::setURL): Clear the document state when the url changes for a HistoryItem. (WebCore::HistoryItem::isCurrentDocument): Added. Compares the HistoryItem url to the document's url. This might not be the best way to do this, but it works for now.
• history/HistoryItem.h:
• loader/FrameLoader.cpp: (WebCore::FrameLoader::saveDocumentState): Only set the document (and form) state if the document is current for the history item.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/history/redirect-load-no-form-restoration-expected.txt (added)
• LayoutTests/fast/history/redirect-load-no-form-restoration.html (added)
• LayoutTests/fast/history/resources/redirect-load.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• WebCore/history/HistoryItem.cpp (modified) (3 diffs)
• WebCore/history/HistoryItem.h (modified) (2 diffs)
• WebCore/loader/FrameLoader.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-05-24  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Darin.
+
+        Test for <rdar://problem/5211921> Form values sometimes get transposed (iGoogle)
+
+        * fast/history/redirect-load-no-form-restoration-expected.txt: Added.
+        * fast/history/redirect-load-no-form-restoration.html: Added.
+        * fast/history/resources/redirect-load.html: Added.
+
 2007-05-24  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-24  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Darin.
+
+        Fix for <rdar://problem/5211921> Form values sometimes get transposed (iGoogle)
+
+        Test: fast/history/redirect-load-no-form-restoration.html
+
+        * history/HistoryItem.cpp:
+        (WebCore::HistoryItem::setURL): Clear the document state when the url changes for a HistoryItem.
+        (WebCore::HistoryItem::isCurrentDocument): Added. Compares the HistoryItem url to the document's url.  This might not be the best way to do this, but it works for now.
+        * history/HistoryItem.h:
+        * loader/FrameLoader.cpp: (WebCore::FrameLoader::saveDocumentState): Only set the document (and form) state if the document is current for the history item.
+
 2007-05-24  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -11432 +11432 @@
                         isa = PBXProject;
                         buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
-                        compatibilityVersion = "Xcode 2.4";
                         hasScannedForEncodings = 1;
                         knownRegions = (
@@ -11447 +11446 @@
                         projectDirPath = "";
                         projectRoot = "";
-                        shouldCheckCompatibility = 1;
                         targets = (
                                 93F198A508245E59001E9ABC /* WebCore */,

trunk/WebCore/history/HistoryItem.cpp

@@ -27 +27 @@
 #include "HistoryItem.h"
 
+#include "Document.h"
 #include "CachedPage.h"
 #include "FrameLoader.h"
@@ -203 +204 @@
     setURLString(url.url());
     setCachedPage(0);
+    clearDocumentState();
 }
 
@@ -382 +384 @@
 }
 
+bool HistoryItem::isCurrentDocument(Document* doc) const
+{
+    // FIXME: We should find a better way to check if this is the current document.
+    return urlString() == doc->URL();
+}
+
 void HistoryItem::mergeAutoCompleteHints(HistoryItem* otherItem)
 {

trunk/WebCore/history/HistoryItem.h

@@ -45 +45 @@
 namespace WebCore {
 
+class Document;
 class CachedPage;
 class Image;
@@ -127 +128 @@
     void setLastVisitedTime(double);
     
+    bool isCurrentDocument(Document*) const;
+    
 #if PLATFORM(MAC)
     id viewState() const;

trunk/WebCore/loader/FrameLoader.cpp

@@ -3766 +3766 @@
         
     if (document->hasSecureForm())
-         return;
+        return;
          
     // For a standard page load, we will have a previous item set, which will be used to
@@ -3783 +3783 @@
         return;
         
-    if (document) {
-        LOG(Loading, "WebCoreLoading %s: saving form state to %p", ((String&)m_frame->tree()->name()).ascii().data(), item);
+    if (document && item->isCurrentDocument(document)) {
+        LOG(Loading, "WebCoreLoading %s: saving form state to %p", m_frame->tree()->name().domString().utf8().data(), item);
         item->setDocumentState(document->formElementsState());
     }