Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Unified Diff: third_party/WebKit/Source/core/fetch/MemoryCache.cpp

Issue 2253853002: Remove SharedBuffer::unlock() and keep Resource's SharedBuffer always locked (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use hasClientsOrObservers() for live_size Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/fetch/MemoryCache.cpp
diff --git a/third_party/WebKit/Source/core/fetch/MemoryCache.cpp b/third_party/WebKit/Source/core/fetch/MemoryCache.cpp
index d6957b64c424a1f5a1b4b2bb3aceb0568f612ba7..a3931def747a3828ab0cc45975a1fdbcdef76b74 100644
--- a/third_party/WebKit/Source/core/fetch/MemoryCache.cpp
+++ b/third_party/WebKit/Source/core/fetch/MemoryCache.cpp
@@ -201,10 +201,7 @@ Resource* MemoryCache::resourceForURL(const KURL& resourceURL, const String& cac
MemoryCacheEntry* entry = resources->get(url);
if (!entry)
return nullptr;
- Resource* resource = entry->resource();
- if (resource && !resource->lock())
- return nullptr;
- return resource;
+ return entry->resource();
}
HeapVector<Member<Resource>> MemoryCache::resourcesForURL(const KURL& resourceURL)
@@ -582,15 +579,12 @@ void MemoryCache::removeURLFromCache(const KURL& url)
void MemoryCache::TypeStatistic::addResource(Resource* o)
{
- bool purgeable = o->isPurgeable();
- size_t pageSize = (o->encodedSize() + o->overheadSize() + 4095) & ~4095;
count++;
size += o->size();
liveSize += o->hasClientsOrObservers() ? o->size() : 0;
decodedSize += o->decodedSize();
encodedSize += o->encodedSize();
encodedSizeDuplicatedInDataURLs += o->url().protocolIsData() ? o->encodedSize() : 0;
- purgeableSize += purgeable ? pageSize : 0;
}
MemoryCache::Statistics MemoryCache::getStatistics()
@@ -779,7 +773,7 @@ void MemoryCache::dumpLRULists(bool includeLive) const
while (current) {
Resource* currentResource = current->resource();
if (includeLive || !currentResource->hasClientsOrObservers())
- printf("(%.1fK, %.1fK, %uA, %dR, %d); ", currentResource->decodedSize() / 1024.0f, (currentResource->encodedSize() + currentResource->overheadSize()) / 1024.0f, current->m_accessCount, currentResource->hasClientsOrObservers(), currentResource->isPurgeable());
+ printf("(%.1fK, %.1fK, %uA, %dR); ", currentResource->decodedSize() / 1024.0f, (currentResource->encodedSize() + currentResource->overheadSize()) / 1024.0f, current->m_accessCount, currentResource->hasClientsOrObservers());
current = current->m_previousInAllResourcesList;
}
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ImageResource.cpp ('k') | third_party/WebKit/Source/core/fetch/Resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698