| 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 6edb7ce376810af497878e678eda2a6bf58660fe..21ea426d3cbaffd2dc7a8f60c56e898d2e0bc47a 100644
|
| --- a/third_party/WebKit/Source/core/fetch/MemoryCache.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/MemoryCache.cpp
|
| @@ -204,11 +204,11 @@ Resource* MemoryCache::resourceForURL(const KURL& resourceURL, const String& cac
|
| return resource;
|
| }
|
|
|
| -WillBeHeapVector<RawPtrWillBeMember<Resource>> MemoryCache::resourcesForURL(const KURL& resourceURL)
|
| +HeapVector<Member<Resource>> MemoryCache::resourcesForURL(const KURL& resourceURL)
|
| {
|
| ASSERT(WTF::isMainThread());
|
| KURL url = removeFragmentIdentifierIfNeeded(resourceURL);
|
| - WillBeHeapVector<RawPtrWillBeMember<Resource>> results;
|
| + HeapVector<Member<Resource>> results;
|
| for (const auto& resourceMapIter : m_resourceMaps) {
|
| if (MemoryCacheEntry* entry = resourceMapIter.value->get(url))
|
| results.append(entry->m_resource.get());
|
| @@ -583,7 +583,7 @@ MemoryCacheLiveResourcePriority MemoryCache::priority(Resource* resource) const
|
|
|
| void MemoryCache::removeURLFromCache(const KURL& url)
|
| {
|
| - WillBeHeapVector<RawPtrWillBeMember<Resource>> resources = resourcesForURL(url);
|
| + HeapVector<Member<Resource>> resources = resourcesForURL(url);
|
| for (Resource* resource : resources)
|
| memoryCache()->remove(resource);
|
| }
|
| @@ -788,7 +788,7 @@ void MemoryCache::dumpLRULists(bool includeLive) const
|
| printf("\n\nList %d: ", i);
|
| MemoryCacheEntry* current = m_allResources[i].m_tail;
|
| while (current) {
|
| - RefPtrWillBeRawPtr<Resource> currentResource = current->m_resource;
|
| + RawPtr<Resource> currentResource = current->m_resource;
|
| if (includeLive || !currentResource->hasClients())
|
| printf("(%.1fK, %.1fK, %uA, %dR, %d); ", currentResource->decodedSize() / 1024.0f, (currentResource->encodedSize() + currentResource->overheadSize()) / 1024.0f, current->m_accessCount, currentResource->hasClients(), currentResource->isPurgeable());
|
|
|
|
|