| 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 76db925f066e0680dde01f7356164474a334a492..dade33621c1c86616ba772536871ae2abe19f339 100644
|
| --- a/third_party/WebKit/Source/core/fetch/MemoryCache.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/MemoryCache.cpp
|
| @@ -22,7 +22,6 @@
|
|
|
| #include "core/fetch/MemoryCache.h"
|
|
|
| -#include "core/fetch/WebCacheMemoryDumpProvider.h"
|
| #include "platform/Logging.h"
|
| #include "platform/TraceEvent.h"
|
| #include "platform/weborigin/SecurityOrigin.h"
|
| @@ -57,7 +56,7 @@ MemoryCache* replaceMemoryCacheForTesting(MemoryCache* cache)
|
| memoryCache();
|
| MemoryCache* oldCache = gMemoryCache->release();
|
| *gMemoryCache = cache;
|
| - WebCacheMemoryDumpProvider::instance()->setMemoryCache(cache);
|
| + MemoryCacheDumpProvider::instance()->setMemoryCache(cache);
|
| return oldCache;
|
| }
|
|
|
| @@ -104,7 +103,7 @@ inline MemoryCache::MemoryCache()
|
| , m_statsTimer(this, &MemoryCache::dumpStats)
|
| #endif
|
| {
|
| - WebCacheMemoryDumpProvider::instance()->setMemoryCache(this);
|
| + MemoryCacheDumpProvider::instance()->setMemoryCache(this);
|
| #ifdef MEMORY_CACHE_STATS
|
| const double statsIntervalInSeconds = 15;
|
| m_statsTimer.startRepeating(statsIntervalInSeconds, BLINK_FROM_HERE);
|
| @@ -127,6 +126,7 @@ DEFINE_TRACE(MemoryCache)
|
| visitor->trace(m_allResources);
|
| visitor->trace(m_liveDecodedResources);
|
| visitor->trace(m_resourceMaps);
|
| + MemoryCacheDumpClient::trace(visitor);
|
| }
|
|
|
| KURL MemoryCache::removeFragmentIdentifierIfNeeded(const KURL& originalURL)
|
| @@ -723,7 +723,7 @@ void MemoryCache::updateFramePaintTimestamp()
|
| m_lastFramePaintTimeStamp = currentTime();
|
| }
|
|
|
| -void MemoryCache::onMemoryDump(WebMemoryDumpLevelOfDetail levelOfDetail, WebProcessMemoryDump* memoryDump)
|
| +bool MemoryCache::onMemoryDump(WebMemoryDumpLevelOfDetail levelOfDetail, WebProcessMemoryDump* memoryDump)
|
| {
|
| for (const auto& resourceMapIter : m_resourceMaps) {
|
| for (const auto& resourceIter : *resourceMapIter.value) {
|
| @@ -731,6 +731,7 @@ void MemoryCache::onMemoryDump(WebMemoryDumpLevelOfDetail levelOfDetail, WebProc
|
| resource->onMemoryDump(levelOfDetail, memoryDump);
|
| }
|
| }
|
| + return true;
|
| }
|
|
|
| bool MemoryCache::isInSameLRUListForTest(const Resource* x, const Resource* y)
|
|
|