Changeset 24087 in webkit

Timestamp:

Jul 6, 2007 11:29:08 PM (17 years ago)

Author:

mjs

Message:

LayoutTests:

Reviewed by Oliver.

• test case for <rdar://problem/5133420> ASSERT in WebDocumentLoaderMac::decreaseLoadCount() un-discarding Gmail message

• fast/loader/early-load-cancel-expected.txt: Added.
• fast/loader/early-load-cancel.html: Added.
• fast/loader/resources/early-load-cancel-inner.html: Added.

WebCore:

Reviewed by Oliver.

• fixed <rdar://problem/5133420> ASSERT in WebDocumentLoaderMac::decreaseLoadCount() un-discarding Gmail message

test case: fast/loader/early-load-cancel.html

• loader/ResourceLoader.cpp: (WebCore::ResourceLoader::didCancel): Don't send cancel-related client callbacks if we never even sent willSendRequest because we were deferred.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/loader/early-load-cancel-expected.txt (added)
• LayoutTests/fast/loader/early-load-cancel.html (added)
• LayoutTests/fast/loader/resources/early-load-cancel-inner.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/ResourceLoader.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-07-06  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Oliver.
+
+        - test case for <rdar://problem/5133420> ASSERT in WebDocumentLoaderMac::decreaseLoadCount() un-discarding Gmail message
+        
+        * fast/loader/early-load-cancel-expected.txt: Added.
+        * fast/loader/early-load-cancel.html: Added.
+        * fast/loader/resources/early-load-cancel-inner.html: Added.
+
 2007-07-06  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-06  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Oliver.
+
+        - fixed <rdar://problem/5133420> ASSERT in WebDocumentLoaderMac::decreaseLoadCount() un-discarding Gmail message
+        
+        test case: fast/loader/early-load-cancel.html
+
+        * loader/ResourceLoader.cpp:
+        (WebCore::ResourceLoader::didCancel): Don't send cancel-related client callbacks
+        if we never even sent willSendRequest because we were deferred.
+
 2007-07-06  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/loader/ResourceLoader.cpp

@@ -284 +284 @@
     m_cancelled = true;
     
+    bool m_hadHandle = m_handle;
     if (m_handle)
         m_handle->clearAuthentication();
@@ -292 +293 @@
         m_handle = 0;
     }
-    if (m_sendResourceLoadCallbacks && !m_calledDidFinishLoad)
+    if (m_sendResourceLoadCallbacks && !m_calledDidFinishLoad && m_hadHandle)
         frameLoader()->didFailToLoad(this, error);