summaryrefslogtreecommitdiff
path: root/Source/WebCore/loader/DocumentLoader.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-09-18 15:53:33 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-09-18 15:53:33 +0200
commit6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 (patch)
treed9c68d1cca0b3e352f1e438561f3e504e641a08f /Source/WebCore/loader/DocumentLoader.cpp
parentd0424a769059c84ae20beb3c217812792ea6726b (diff)
downloadqtwebkit-6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2.tar.gz
Imported WebKit commit c7503cef7ecb236730d1309676ab9fc723fd061d (http://svn.webkit.org/repository/webkit/trunk@128886)
New snapshot with various build fixes
Diffstat (limited to 'Source/WebCore/loader/DocumentLoader.cpp')
-rw-r--r--Source/WebCore/loader/DocumentLoader.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
index 5ca9d683d..88b7fe83b 100644
--- a/Source/WebCore/loader/DocumentLoader.cpp
+++ b/Source/WebCore/loader/DocumentLoader.cpp
@@ -360,26 +360,26 @@ void DocumentLoader::commitData(const char* bytes, size_t length)
void DocumentLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
- info.addInstrumentedMember(m_frame);
- info.addInstrumentedMember(m_mainResourceLoader);
+ info.addMember(m_frame);
+ info.addMember(m_mainResourceLoader);
info.addInstrumentedHashSet(m_subresourceLoaders);
info.addInstrumentedHashSet(m_multipartSubresourceLoaders);
info.addInstrumentedHashSet(m_plugInStreamLoaders);
- info.addInstrumentedMember(m_substituteData);
- info.addInstrumentedMember(m_pageTitle.string());
- info.addInstrumentedMember(m_overrideEncoding);
+ info.addMember(m_substituteData);
+ info.addMember(m_pageTitle.string());
+ info.addMember(m_overrideEncoding);
info.addVector(m_responses);
- info.addInstrumentedMember(m_originalRequest);
- info.addInstrumentedMember(m_originalRequestCopy);
- info.addInstrumentedMember(m_request);
- info.addInstrumentedMember(m_response);
- info.addInstrumentedMember(m_lastCheckedRequest);
+ info.addMember(m_originalRequest);
+ info.addMember(m_originalRequestCopy);
+ info.addMember(m_request);
+ info.addMember(m_response);
+ info.addMember(m_lastCheckedRequest);
info.addInstrumentedVector(m_responses);
info.addHashMap(m_pendingSubstituteResources);
info.addInstrumentedHashSet(m_resourcesClientKnowsAbout);
info.addVector(m_resourcesLoadedFromMemoryCacheForClientNotification);
- info.addInstrumentedMember(m_clientRedirectSourceForHistory);
- info.addInstrumentedMember(m_mainResourceData);
+ info.addMember(m_clientRedirectSourceForHistory);
+ info.addMember(m_mainResourceData);
}
bool DocumentLoader::doesProgressiveLoad(const String& MIMEType) const