Changeset 17661 in webkit

Timestamp:

Nov 8, 2006 2:02:03 AM (17 years ago)

Author:

beidson

Message:

LayoutTests:

Reviewed by Maciej

Added test to cover bug ​http://bugs.webkit.org/show_bug.cgi?id=11450
-Confirm there is no assert when nuking a frame with an active XMLHttpRequest load
-Confirm the correct state-change notifications for the request are dispatched

• http/tests/xmlhttprequest/frame-load-cancelled-abort-expected.txt: Added.
• http/tests/xmlhttprequest/frame-load-cancelled-abort.html: Added.
• http/tests/xmlhttprequest/resources/endlessxml.php: Added.
• http/tests/xmlhttprequest/resources/frame-load-to-cancel.html: Added.

WebCore:

Reviewed by Maciej

If the request has already been aborted, bail out of didFinishLoading()
immediately. This prevents state change notifications that aren't
needed.

• xml/xmlhttprequest.cpp: (WebCore::XMLHttpRequest::didFinishLoading):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/xmlhttprequest/frame-load-cancelled-abort-expected.txt (added)
• LayoutTests/http/tests/xmlhttprequest/frame-load-cancelled-abort.html (added)
• LayoutTests/http/tests/xmlhttprequest/resources/endlessxml.php (added)
• LayoutTests/http/tests/xmlhttprequest/resources/frame-load-to-cancel.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/xml/xmlhttprequest.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-11-08  Brady Eidson <beidson@apple.com>
+
+        Reviewed by Maciej
+
+        Added test to cover bug http://bugs.webkit.org/show_bug.cgi?id=11450
+        -Confirm there is no assert when nuking a frame with an active XMLHttpRequest load
+        -Confirm the correct state-change notifications for the request are dispatched
+
+        * http/tests/xmlhttprequest/frame-load-cancelled-abort-expected.txt: Added.
+        * http/tests/xmlhttprequest/frame-load-cancelled-abort.html: Added.
+        * http/tests/xmlhttprequest/resources/endlessxml.php: Added.
+        * http/tests/xmlhttprequest/resources/frame-load-to-cancel.html: Added.
+
 2006-11-08  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-08  Brady Eidson <beidson@apple.com>
+
+        Reviewed by Maciej
+
+        If the request has already been aborted, bail out of didFinishLoading()
+        immediately.  This prevents state change notifications that aren't
+        needed.
+
+        * xml/xmlhttprequest.cpp:
+        (WebCore::XMLHttpRequest::didFinishLoading):
+
 2006-11-08  Darin Adler  <darin@apple.com>
 

trunk/WebCore/xml/xmlhttprequest.cpp

@@ -486 +486 @@
 void XMLHttpRequest::didFinishLoading(ResourceHandle* loader)
 {
-    ASSERT(m_aborted || loader == m_loader);
+    if (m_aborted)
+        return;
+        
+    ASSERT(loader == m_loader);
 
     if (m_state < Sent)