Changeset 140174 in webkit

Timestamp:

Jan 18, 2013 10:25:16 AM (11 years ago)

Author:

Nate Chapin

Message:

Cannot abort multiple XHR POSTs made to same url
​https://bugs.webkit.org/show_bug.cgi?id=106937

Reviewed by Alexey Proskuryakov.

Source/WebCore:

Test: http/tests/cache/cancel-multiple-post-xhrs.html

• loader/cache/CachedResource.cpp:

(WebCore::CachedResource::removeClient): Call allClientsRemoved() regardless

of whether this resource is inCache(). Otherwise, CachedRawResources will
not have the opportunity to cancel as expected. However, don't cancel
if the last client was removed because we're in the middle of switching
the clients over to a successfully revalidated resource.

LayoutTests:

• http/tests/cache/cancel-multiple-post-xhrs-expected.txt: Added.
• http/tests/cache/cancel-multiple-post-xhrs.html: Added.
• platform/mac/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/cache/cancel-multiple-post-xhrs-expected.txt (added)
• LayoutTests/http/tests/cache/cancel-multiple-post-xhrs.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResource.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-18  Nate Chapin  <japhet@chromium.org>
+
+        Cannot abort multiple XHR POSTs made to same url
+        https://bugs.webkit.org/show_bug.cgi?id=106937
+
+        Reviewed by Alexey Proskuryakov.
+
+        * http/tests/cache/cancel-multiple-post-xhrs-expected.txt: Added.
+        * http/tests/cache/cancel-multiple-post-xhrs.html: Added.
+        * platform/mac/TestExpectations:
+
 2013-01-18  Dima Gorbik  <dgorbik@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -379 +379 @@
 http/tests/inspector/network/network-size-chunked.html
 http/tests/inspector/network/network-size-sync.html
-
-# https://bugs.webkit.org/show_bug.cgi?id=64097
-http/tests/inspector/network/network-disable-cache-memory.html
-http/tests/inspector/network/network-disable-cache-xhrs.html
 
 # Quota API is not supported.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-18  Nate Chapin  <japhet@chromium.org>
+
+        Cannot abort multiple XHR POSTs made to same url
+        https://bugs.webkit.org/show_bug.cgi?id=106937
+
+        Reviewed by Alexey Proskuryakov.
+
+        Test: http/tests/cache/cancel-multiple-post-xhrs.html
+
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::removeClient): Call allClientsRemoved() regardless
+            of whether this resource is inCache(). Otherwise, CachedRawResources will
+            not have the opportunity to cancel as expected. However, don't cancel
+            if the last client was removed because we're in the middle of switching
+            the clients over to a successfully revalidated resource.
+
 2013-01-18  Dima Gorbik  <dgorbik@apple.com>
 

trunk/Source/WebCore/loader/cache/CachedResource.cpp

@@ -526 +526 @@
 
     bool deleted = deleteIfPossible();
-    if (!deleted && !hasClients() && inCache()) {
-        memoryCache()->removeFromLiveResourcesSize(this);
-        memoryCache()->removeFromLiveDecodedResourcesList(this);
-        allClientsRemoved();
+    if (!deleted && !hasClients()) {
+        if (inCache()) {
+            memoryCache()->removeFromLiveResourcesSize(this);
+            memoryCache()->removeFromLiveDecodedResourcesList(this);
+        }
+        if (!m_switchingClientsToRevalidatedResource)
+            allClientsRemoved();
         destroyDecodedDataIfNeeded();
         if (response().cacheControlContainsNoStore()) {