Changeset 138958 in webkit

Timestamp:

Jan 7, 2013 10:32:16 AM (11 years ago)

Author:

pdr@google.com

Message:

Refactor client removal in CachedResource::switchClientsToRevalidatedResource
​https://bugs.webkit.org/show_bug.cgi?id=106206

Previously switchClientsToRevalidatedResource() failed to call didRemoveClient() for each
client and instead simply cleared m_clients. This patch removes an incorrect comment and
refactors the code so that removeClient() and didRemoveClient() are properly called.

Reviewed by Nate Chapin.

No new tests as there are no observable changes from this refactoring.

• loader/cache/CachedResource.cpp:

(WebCore::CachedResource::switchClientsToRevalidatedResource):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedResource.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-07  Philip Rogers  <pdr@google.com>
+
+        Refactor client removal in CachedResource::switchClientsToRevalidatedResource
+        https://bugs.webkit.org/show_bug.cgi?id=106206
+
+        Previously switchClientsToRevalidatedResource() failed to call didRemoveClient() for each
+        client and instead simply cleared m_clients. This patch removes an incorrect comment and
+        refactors the code so that removeClient() and didRemoveClient() are properly called.
+
+        Reviewed by Nate Chapin.
+
+        No new tests as there are no observable changes from this refactoring.
+
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::switchClientsToRevalidatedResource):
+
 2013-01-07  Julien Chaffraix  <jchaffraix@webkit.org>
 

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

@@ -708 +708 @@
         }
     }
-    // Equivalent of calling removeClient() for all clients
-    m_clients.clear();
 
     unsigned moveCount = clientsToMove.size();
+    for (unsigned n = 0; n < moveCount; ++n)
+        removeClient(clientsToMove[n]);
+    ASSERT(m_clients.isEmpty());
+
     for (unsigned n = 0; n < moveCount; ++n)
         m_resourceToRevalidate->addClientToSet(clientsToMove[n]);