Add Web Resources usage to chrome://tracing.

third_party/WebKit/Source/core/fetch/MemoryCache.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #include "config.h"
 #include "core/fetch/MemoryCache.h"
 
 #include "core/fetch/ResourcePtr.h"
+#include "core/fetch/WebCacheMemoryDumpProvider.h"
 #include "platform/Logging.h"
 #include "platform/TraceEvent.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/weborigin/SecurityOriginHash.h"
 #include "public/platform/Platform.h"
 #include "wtf/Assertions.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/MainThread.h"
 #include "wtf/MathExtras.h"
 #include "wtf/TemporaryChange.h"
@@ skipping 20 matching lines @@
 MemoryCache* replaceMemoryCacheForTesting(MemoryCache* cache)
 {
 #if ENABLE(OILPAN)
     // Move m_liveResources content to keep Resource objects alive.
     for (const auto& resource : memoryCache()->m_liveResources)
         cache->m_liveResources.add(resource);
     memoryCache()->m_liveResources.clear();
 #endif
     memoryCache();
     MemoryCache* oldCache = gMemoryCache->release();
     *gMemoryCache = cache;

[haraken, 2015/10/14 09:04:07]

You need to call setMemoryCache here as well.

[ssid, 2015/10/14 12:06:40]

Done.

     return oldCache;
 }
 
 DEFINE_TRACE(MemoryCacheEntry)
 {
     visitor->trace(m_previousInLiveResourcesList);
     visitor->trace(m_nextInLiveResourcesList);
     visitor->trace(m_previousInAllResourcesList);
     visitor->trace(m_nextInAllResourcesList);
 }
@@ skipping 20 matching lines @@
     , m_minDeadCapacity(0)
     , m_maxDeadCapacity(cDefaultCacheCapacity)
     , m_maxDeferredPruneDeadCapacity(cDeferredPruneDeadCapacityFactor * cDefaultCacheCapacity)
     , m_delayBeforeLiveDecodedPrune(cMinDelayBeforeLiveDecodedPrune)
     , m_liveSize(0)
     , m_deadSize(0)
 #ifdef MEMORY_CACHE_STATS
     , m_statsTimer(this, &MemoryCache::dumpStats)
 #endif
 {
+    WebCacheMemoryDumpProvider::instance()->setMemoryCache(this);
 #ifdef MEMORY_CACHE_STATS
     const double statsIntervalInSeconds = 15;
     m_statsTimer.startRepeating(statsIntervalInSeconds, FROM_HERE);
 #endif
 }
 
 MemoryCache* MemoryCache::create()
 {
     return new MemoryCache;
 }
@@ skipping 655 matching lines @@
     pruneLiveResources(strategy);
     m_pruneFrameTimeStamp = m_lastFramePaintTimeStamp;
     m_pruneTimeStamp = currentTime;
 }
 
 void MemoryCache::updateFramePaintTimestamp()
 {
     m_lastFramePaintTimeStamp = currentTime();
 }
 
+void MemoryCache::onMemoryDump(WebProcessMemoryDump* memoryDump)
+{
+    for (const auto& resourceMapIter : m_resourceMaps) {
+        for (const auto& resourceIter : *resourceMapIter.value) {
+            Resource* resource = resourceIter.value->m_resource.get();
+            resource->onMemoryDump(memoryDump);
+        }
+    }
+}
+
 void MemoryCache::registerLiveResource(Resource& resource)
 {
 #if ENABLE(OILPAN)
     ASSERT(!m_liveResources.contains(&resource));
     m_liveResources.add(&resource);
 #endif
 }
 
 void MemoryCache::unregisterLiveResource(Resource& resource)
 {
@@ skipping 41 matching lines @@
                 printf("(%.1fK, %.1fK, %uA, %dR, %d, %d); ", currentResource->decodedSize() / 1024.0f, (currentResource->encodedSize() + currentResource->overheadSize()) / 1024.0f, current->m_accessCount, currentResource->hasClients(), currentResource->isPurgeable(), currentResource->wasPurged());
 
             current = current->m_previousInAllResourcesList;
         }
     }
 }
 
 #endif // MEMORY_CACHE_STATS
 
 } // namespace blink