Index: Source/core/loader/cache/CachedResource.cpp |
diff --git a/Source/core/loader/cache/CachedResource.cpp b/Source/core/loader/cache/CachedResource.cpp |
index 1bb2e50015e70162b20d0177929d32419c1b0ba4..48333c80b83b27cb88d7c20d018d9db7ddcdba01 100644 |
--- a/Source/core/loader/cache/CachedResource.cpp |
+++ b/Source/core/loader/cache/CachedResource.cpp |
@@ -44,25 +44,13 @@ |
#include "SecurityPolicy.h" |
#include "SharedBuffer.h" |
#include "ResourceLoader.h" |
-#include "WebCoreMemoryInstrumentation.h" |
#include <wtf/CurrentTime.h> |
#include <wtf/MathExtras.h> |
-#include <wtf/MemoryInstrumentationHashCountedSet.h> |
-#include <wtf/MemoryInstrumentationHashSet.h> |
-#include <wtf/MemoryObjectInfo.h> |
#include <wtf/RefCountedLeakCounter.h> |
#include <wtf/StdLibExtras.h> |
#include <wtf/text/CString.h> |
#include <wtf/Vector.h> |
-namespace WTF { |
- |
-template<> struct SequenceMemoryInstrumentationTraits<WebCore::CachedResourceClient*> { |
- template <typename I> static void reportMemoryUsage(I, I, MemoryClassInfo&) { } |
-}; |
- |
-} |
- |
using namespace WTF; |
namespace WebCore { |
@@ -920,31 +908,4 @@ void CachedResource::CachedResourceCallback::timerFired(Timer<CachedResourceCall |
m_resource->didAddClient(m_client); |
} |
-void CachedResource::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
-{ |
- MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResource); |
- memoryObjectInfo->setName(url().string().utf8().data()); |
- info.addMember(m_resourceRequest, "resourceRequest"); |
- info.addMember(m_fragmentIdentifierForRequest, "fragmentIdentifierForRequest"); |
- info.addMember(m_clients, "clients"); |
- info.addMember(m_accept, "accept"); |
- info.addMember(m_loader, "loader"); |
- info.addMember(m_response, "response"); |
- info.addMember(m_data, "data"); |
- info.addMember(m_cachedMetadata, "cachedMetadata"); |
- info.addMember(m_nextInAllResourcesList, "nextInAllResourcesList"); |
- info.addMember(m_prevInAllResourcesList, "prevInAllResourcesList"); |
- info.addMember(m_nextInLiveResourcesList, "nextInLiveResourcesList"); |
- info.addMember(m_prevInLiveResourcesList, "prevInLiveResourcesList"); |
- info.addMember(m_owningCachedResourceLoader, "owningCachedResourceLoader"); |
- info.addMember(m_resourceToRevalidate, "resourceToRevalidate"); |
- info.addMember(m_proxyResource, "proxyResource"); |
- info.addMember(m_handlesToRevalidate, "handlesToRevalidate"); |
- info.addMember(m_options, "options"); |
- info.addMember(m_decodedDataDeletionTimer, "decodedDataDeletionTimer"); |
- info.ignoreMember(m_clientsAwaitingCallback); |
- |
- if (m_purgeableData && !m_purgeableData->wasPurged()) |
- info.addRawBuffer(m_purgeableData.get(), m_purgeableData->size(), "PurgeableData", "purgeableData"); |
-} |
} |