Diff
Modified: branches/chromium/963/Source/WebCore/loader/SubresourceLoader.cpp (105797 => 105798)
--- branches/chromium/963/Source/WebCore/loader/SubresourceLoader.cpp 2012-01-24 21:27:16 UTC (rev 105797)
+++ branches/chromium/963/Source/WebCore/loader/SubresourceLoader.cpp 2012-01-24 21:27:22 UTC (rev 105798)
@@ -156,12 +156,9 @@
if (response.httpStatusCode() == 304) {
// 304 Not modified / Use local copy
// Existing resource is ok, just use it updating the expiration time.
- m_state = Revalidating;
memoryCache()->revalidationSucceeded(m_resource, response);
- if (!reachedTerminalState()) {
+ if (!reachedTerminalState())
ResourceLoader::didReceiveResponse(response);
- didFinishLoading(monotonicallyIncreasingTime());
- }
return;
}
// Did not get 304 response, continue as a regular resource load.
@@ -244,7 +241,7 @@
void SubresourceLoader::didFinishLoading(double finishTime)
{
- if (m_state != Initialized && m_state != Revalidating)
+ if (m_state != Initialized)
return;
ASSERT(!reachedTerminalState());
ASSERT(!m_resource->resourceToRevalidate());
Modified: branches/chromium/963/Source/WebCore/loader/SubresourceLoader.h (105797 => 105798)
--- branches/chromium/963/Source/WebCore/loader/SubresourceLoader.h 2012-01-24 21:27:16 UTC (rev 105797)
+++ branches/chromium/963/Source/WebCore/loader/SubresourceLoader.h 2012-01-24 21:27:22 UTC (rev 105798)
@@ -76,7 +76,6 @@
enum SubresourceLoaderState {
Uninitialized,
Initialized,
- Revalidating,
Finishing,
Releasing
};
Modified: branches/chromium/963/Source/WebCore/loader/cache/CachedResource.cpp (105797 => 105798)
--- branches/chromium/963/Source/WebCore/loader/cache/CachedResource.cpp 2012-01-24 21:27:16 UTC (rev 105797)
+++ branches/chromium/963/Source/WebCore/loader/cache/CachedResource.cpp 2012-01-24 21:27:22 UTC (rev 105798)
@@ -139,6 +139,7 @@
, m_requestedFromNetworkingLayer(false)
, m_inCache(false)
, m_loading(false)
+ , m_switchingClientsToRevalidatedResource(false)
, m_type(type)
, m_status(Pending)
#ifndef NDEBUG
@@ -520,6 +521,9 @@
void CachedResource::clearResourceToRevalidate()
{
ASSERT(m_resourceToRevalidate);
+ if (m_switchingClientsToRevalidatedResource)
+ return;
+
// A resource may start revalidation before this method has been called, so check that this resource is still the proxy resource before clearing it out.
if (m_resourceToRevalidate->m_proxyResource == this) {
m_resourceToRevalidate->m_proxyResource = 0;
@@ -538,6 +542,7 @@
LOG(ResourceLoading, "CachedResource %p switchClientsToRevalidatedResource %p", this, m_resourceToRevalidate);
+ m_switchingClientsToRevalidatedResource = true;
HashSet<CachedResourceHandleBase*>::iterator end = m_handlesToRevalidate.end();
for (HashSet<CachedResourceHandleBase*>::iterator it = m_handlesToRevalidate.begin(); it != end; ++it) {
CachedResourceHandleBase* handle = *it;
@@ -565,10 +570,14 @@
for (unsigned n = 0; n < moveCount; ++n)
m_resourceToRevalidate->addClientToSet(clientsToMove[n]);
for (unsigned n = 0; n < moveCount; ++n) {
+ // Calling didAddClient may do anything, including trying to cancel revalidation.
+ // Assert that it didn't succeed.
+ ASSERT(m_resourceToRevalidate);
// Calling didAddClient for a client may end up removing another client. In that case it won't be in the set anymore.
if (m_resourceToRevalidate->m_clients.contains(clientsToMove[n]))
m_resourceToRevalidate->didAddClient(clientsToMove[n]);
}
+ m_switchingClientsToRevalidatedResource = false;
}
void CachedResource::updateResponseAfterRevalidation(const ResourceResponse& validatingResponse)
Modified: branches/chromium/963/Source/WebCore/loader/cache/CachedResource.h (105797 => 105798)
--- branches/chromium/963/Source/WebCore/loader/cache/CachedResource.h 2012-01-24 21:27:16 UTC (rev 105797)
+++ branches/chromium/963/Source/WebCore/loader/cache/CachedResource.h 2012-01-24 21:27:22 UTC (rev 105798)
@@ -293,6 +293,8 @@
bool m_inCache : 1;
bool m_loading : 1;
+ bool m_switchingClientsToRevalidatedResource : 1;
+
unsigned m_type : 4; // Type
unsigned m_status : 3; // Status
Modified: branches/chromium/963/Source/WebCore/loader/cache/MemoryCache.cpp (105797 => 105798)
--- branches/chromium/963/Source/WebCore/loader/cache/MemoryCache.cpp 2012-01-24 21:27:16 UTC (rev 105797)
+++ branches/chromium/963/Source/WebCore/loader/cache/MemoryCache.cpp 2012-01-24 21:27:22 UTC (rev 105798)
@@ -120,6 +120,7 @@
adjustSize(resource->hasClients(), delta);
revalidatingResource->switchClientsToRevalidatedResource();
+ ASSERT(!revalidatingResource->m_deleted);
// this deletes the revalidating resource
revalidatingResource->clearResourceToRevalidate();
}
