Changeset 69432 in webkit

Timestamp:

Oct 8, 2010 5:01:57 PM (14 years ago)

Author:

mihaip@chromium.org

Message:

2010-10-08 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Adam Barth.

popstate events are lost when network connection is in progress
​https://bugs.webkit.org/show_bug.cgi?id=42940

Add test case where we have an image request that never finishes while
using pushState and history.back().

• http/tests/history/popstate-fires-with-pending-requests-expected.txt: Added.
• http/tests/history/popstate-fires-with-pending-requests.html: Added.
• http/tests/history/resources/slow-image.php: Added.

2010-10-08 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Adam Barth.

popstate events are lost when network connection is in progress
​https://bugs.webkit.org/show_bug.cgi?id=42940

Instead of checking FrameLoader::isComplete() (which isn't true if the
document's resource loader has requests outstanding), check that the
document's readyState is complete, as the spec says.

Test: http/tests/history/popstate-fires-with-pending-requests.html

• dom/Document.cpp: (WebCore::Document::statePopped):
• loader/FrameLoader.cpp: (WebCore::FrameLoader::didBeginDocument): Added call to set readyState to Loading earlier. Otherwise, readyState's initial value is Complete, and we only set it to Loading in Document::implicitOpen (which is called after FrameLoader::didBeginDocument by DocumentWriter::begin), so we could end up in Document::statePopped and have the readyState be Complete, even if we hadn't even begin loading the document.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/history/popstate-fires-with-pending-requests-expected.txt (added)
• LayoutTests/http/tests/history/popstate-fires-with-pending-requests.html (added)
• LayoutTests/http/tests/history/resources/slow-image.php (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-08  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        popstate events are lost when network connection is in progress
+        https://bugs.webkit.org/show_bug.cgi?id=42940
+        
+        Add test case where we have an image request that never finishes while
+        using pushState and history.back().
+
+        * http/tests/history/popstate-fires-with-pending-requests-expected.txt: Added.
+        * http/tests/history/popstate-fires-with-pending-requests.html: Added.
+        * http/tests/history/resources/slow-image.php: Added.
+
 2010-10-08  Abhishek Arya  <inferno@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-08  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        popstate events are lost when network connection is in progress
+        https://bugs.webkit.org/show_bug.cgi?id=42940
+        
+        Instead of checking FrameLoader::isComplete() (which isn't true if the
+        document's resource loader has requests outstanding), check that the
+        document's readyState is complete, as the spec says.
+
+        Test: http/tests/history/popstate-fires-with-pending-requests.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::statePopped):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::didBeginDocument): Added call to set readyState
+        to Loading earlier. Otherwise, readyState's initial value is Complete,
+        and we only set it to Loading in Document::implicitOpen (which is called
+        after FrameLoader::didBeginDocument by DocumentWriter::begin), so we 
+        could end up in Document::statePopped and have the readyState be
+        Complete, even if we hadn't even begin loading the document.
+
 2010-10-08  Daniel Cheng  <dcheng@chromium.org>
 

trunk/WebCore/dom/Document.cpp

@@ -4429 +4429 @@
 void Document::statePopped(SerializedScriptValue* stateObject)
 {
-    Frame* f = frame();
-    if (!f)
-        return;
-    
-    if (f->loader()->isComplete())
+    if (!frame())
+        return;
+    
+    // Per step 11 of section 6.5.9 (history traversal) of the HTML5 spec, we 
+    // defer firing of popstate until we're in the complete state.
+    if (m_readyState == Complete)
         enqueuePopstateEvent(stateObject);
     else

trunk/WebCore/loader/FrameLoader.cpp

@@ -659 +659 @@
     m_didCallImplicitClose = false;
     m_isLoadingMainResource = true;
+    m_frame->document()->setReadyState(Document::Loading);
 
     if (m_pendingStateObject) {