Chromium Code Reviews| 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..0780dae17123fb08cfb6f4947b0dee10a2fe99eb 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; |
|
haraken
2016/08/17 08:13:31
Can you remove the purgeableSize member entirely?
hiroshige
2016/08/17 09:02:37
Yes.
Created a separate CL: https://codereview.chr
|
| } |
| MemoryCache::Statistics MemoryCache::getStatistics() |