| Index: Source/core/fetch/MemoryCache.cpp
|
| diff --git a/Source/core/fetch/MemoryCache.cpp b/Source/core/fetch/MemoryCache.cpp
|
| index 89f13fc6d5a54623dadccef8c695e42df57ba4d4..680536596b9316712c76f2c1dbab49d8fcdb5d1c 100644
|
| --- a/Source/core/fetch/MemoryCache.cpp
|
| +++ b/Source/core/fetch/MemoryCache.cpp
|
| @@ -233,11 +233,10 @@
|
| MemoryCacheEntry* current = m_allResources[i].m_tail;
|
| while (current) {
|
| MemoryCacheEntry* previous = current->m_previousInAllResourcesList;
|
| - if (current->m_resource->wasPurged() && current->m_resource->canDelete()) {
|
| + if (current->m_resource->wasPurged()) {
|
| ASSERT(!current->m_resource->hasClients());
|
| ASSERT(!current->m_resource->isPreloaded());
|
| - bool wasEvicted = evict(current);
|
| - ASSERT_UNUSED(wasEvicted, wasEvicted);
|
| + evict(current);
|
| }
|
| current = previous;
|
| }
|
| @@ -276,10 +275,8 @@
|
| while (current) {
|
| MemoryCacheEntry* previous = current->m_previousInAllResourcesList;
|
| ASSERT(!previous || contains(previous->m_resource.get()));
|
| - if (!current->m_resource->hasClients() && !current->m_resource->isPreloaded()
|
| - && !current->m_resource->isCacheValidator() && current->m_resource->canDelete()) {
|
| - bool wasEvicted = evict(current);
|
| - ASSERT_UNUSED(wasEvicted, wasEvicted);
|
| + if (!current->m_resource->hasClients() && !current->m_resource->isPreloaded() && !current->m_resource->isCacheValidator()) {
|
| + evict(current);
|
| if (targetSize && m_deadSize <= targetSize)
|
| return;
|
| }
|
|
|