| Index: Source/core/fetch/MemoryCache.cpp
|
| diff --git a/Source/core/fetch/MemoryCache.cpp b/Source/core/fetch/MemoryCache.cpp
|
| index 824a779a56472befab8403e84bbd7c3424ba06a4..4aa2a5aca2024e0ee814717db0681b78b05a0111 100644
|
| --- a/Source/core/fetch/MemoryCache.cpp
|
| +++ b/Source/core/fetch/MemoryCache.cpp
|
| @@ -62,11 +62,8 @@ PassOwnPtrWillBeRawPtr<MemoryCache> replaceMemoryCacheForTesting(PassOwnPtrWillB
|
| {
|
| #if ENABLE(OILPAN)
|
| // Move m_liveResources content to keep Resource objects alive.
|
| - for (HeapHashSet<Member<Resource> >::iterator i = memoryCache()->m_liveResources.begin();
|
| - i != memoryCache()->m_liveResources.end();
|
| - ++i) {
|
| - cache->m_liveResources.add(*i);
|
| - }
|
| + for (const auto& resource : memoryCache()->m_liveResources)
|
| + cache->m_liveResources.add(resource);
|
| memoryCache()->m_liveResources.clear();
|
| #else
|
| // Make sure we have non-empty gMemoryCache.
|
| @@ -616,9 +613,8 @@ void MemoryCache::TypeStatistic::addResource(Resource* o)
|
| MemoryCache::Statistics MemoryCache::getStatistics()
|
| {
|
| Statistics stats;
|
| - ResourceMap::iterator e = m_resources.end();
|
| - for (ResourceMap::iterator i = m_resources.begin(); i != e; ++i) {
|
| - Resource* resource = i->value->m_resource.get();
|
| + for (const auto& resourceIter : m_resources) {
|
| + Resource* resource = resourceIter.value->m_resource.get();
|
| switch (resource->type()) {
|
| case Resource::Image:
|
| stats.images.addResource(resource);
|
|
|