Diff
Modified: trunk/Source/WebCore/ChangeLog (139588 => 139589)
--- trunk/Source/WebCore/ChangeLog 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/ChangeLog 2013-01-14 08:21:49 UTC (rev 139589)
@@ -1,3 +1,55 @@
+2013-01-10 Ilya Tikhonovsky <[email protected]>
+
+ Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 2/N
+ https://bugs.webkit.org/show_bug.cgi?id=106546
+
+ Reviewed by Vsevolod Vlasov.
+
+ Many nontrivial class members were added into reportMemoryUsage methods.
+
+ * bindings/v8/V8PerIsolateData.cpp:
+ (WebCore::V8PerIsolateData::reportMemoryUsage):
+ * css/CSSMediaRule.cpp:
+ (WebCore::CSSMediaRule::reportMemoryUsage):
+ * css/CSSProperty.cpp:
+ (WebCore::CSSProperty::reportMemoryUsage):
+ * css/CSSStyleSheet.cpp:
+ (WebCore::CSSStyleSheet::reportMemoryUsage):
+ * css/MediaList.cpp:
+ (WebCore::MediaList::reportMemoryUsage):
+ * css/RuleSet.cpp:
+ (WebCore::RuleData::reportMemoryUsage):
+ (WebCore::RuleSet::reportMemoryUsage):
+ (WebCore::RuleSet::RuleSetSelectorPair::reportMemoryUsage):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::MatchedPropertiesCacheItem::reportMemoryUsage):
+ (WebCore::StyleResolver::reportMemoryUsage):
+ * css/StyleSheetContents.cpp:
+ (WebCore::StyleSheetContents::reportMemoryUsage):
+ * dom/TreeScope.cpp:
+ (WebCore::TreeScope::reportMemoryUsage):
+ * inspector/HeapGraphSerializer.cpp:
+ (WebCore::HeapGraphSerializer::reportMemoryUsage):
+ * inspector/InspectorMemoryAgent.cpp:
+ * inspector/InspectorProfilerAgent.cpp:
+ (WebCore::InspectorProfilerAgent::reportMemoryUsage):
+ * inspector/MemoryInstrumentationImpl.cpp:
+ (WebCore::MemoryInstrumentationClientImpl::reportMemoryUsage):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::reportMemoryUsage):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::reportMemoryUsage):
+ * loader/MainResourceLoader.cpp:
+ (WebCore::MainResourceLoader::reportMemoryUsage):
+ * loader/Prerenderer.cpp:
+ (WebCore::Prerenderer::reportMemoryUsage):
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::reportMemoryUsage):
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::reportMemoryUsage):
+ * page/Page.cpp:
+ (WebCore::Page::reportMemoryUsage):
+
2013-01-13 Levi Weintraub <[email protected]>
Unreviewed gardening. Rolling out r139537. It broke platforms without sub-pixel layout.
Modified: trunk/Source/WebCore/bindings/v8/V8PerIsolateData.cpp (139588 => 139589)
--- trunk/Source/WebCore/bindings/v8/V8PerIsolateData.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/bindings/v8/V8PerIsolateData.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -106,9 +106,19 @@
info.addMember(m_rawTemplates);
info.addMember(m_templates);
info.addMember(m_stringCache);
+ info.addMember(m_integerCache);
info.addMember(m_domDataList);
+ info.addMember(m_domDataStore);
+ info.addMember(m_hiddenPropertyName);
+ info.addMember(m_gcEventData);
info.addPrivateBuffer(ScriptProfiler::profilerSnapshotsSize(), WebCoreMemoryTypes::InspectorProfilerAgent);
+
+ info.ignoreMember(m_toStringTemplate);
+ info.ignoreMember(m_lazyEventListenerToStringTemplate);
+ info.ignoreMember(m_v8Null);
+ info.ignoreMember(m_liveRoot);
+ info.ignoreMember(m_auxiliaryContext);
}
#if ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/css/CSSProperty.cpp (139588 => 139589)
--- trunk/Source/WebCore/css/CSSProperty.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/css/CSSProperty.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -701,6 +701,7 @@
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
info.addMember(m_value);
+ info.ignoreMember(m_metadata);
}
} // namespace WebCore
Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (139588 => 139589)
--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -189,6 +189,7 @@
info.addMember(m_ownerRule);
info.addMember(m_mediaCSSOMWrapper);
info.addMember(m_childRuleCSSOMWrappers);
+ info.addMember(m_ruleListCSSOMWrapper);
}
void CSSStyleSheet::setDisabled(bool disabled)
Modified: trunk/Source/WebCore/css/MediaList.cpp (139588 => 139589)
--- trunk/Source/WebCore/css/MediaList.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/css/MediaList.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -300,6 +300,8 @@
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
info.addMember(m_mediaQueries);
+ info.addMember(m_parentStyleSheet);
+ info.addMember(m_parentRule);
}
#if ENABLE(RESOLUTION_MEDIA_QUERY)
Modified: trunk/Source/WebCore/css/RuleSet.cpp (139588 => 139589)
--- trunk/Source/WebCore/css/RuleSet.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/css/RuleSet.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -129,6 +129,7 @@
void RuleData::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
+ info.addMember(m_rule);
}
static void reportAtomRuleMap(MemoryClassInfo* info, const RuleSet::AtomRuleMap& atomicRuleMap)
@@ -153,12 +154,14 @@
info.addMember(m_universalRules);
info.addMember(m_pageRules);
info.addMember(m_regionSelectorsAndRuleSets);
+ info.addMember(m_features);
}
void RuleSet::RuleSetSelectorPair::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
info.addMember(ruleSet);
+ info.addMember(selector);
}
static void collectFeaturesFromRuleData(RuleFeatureSet& features, const RuleData& ruleData)
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (139588 => 139589)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -5305,6 +5305,9 @@
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
info.addMember(matchedProperties);
+ info.addMember(ranges);
+ info.addMember(renderStyle);
+ info.addMember(parentRenderStyle);
}
void MediaQueryResult::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
@@ -5319,16 +5322,32 @@
info.addMember(m_style);
info.addMember(m_authorStyle);
info.addMember(m_userStyle);
+ info.addMember(m_features);
info.addMember(m_siblingRuleSet);
info.addMember(m_uncommonAttributeRuleSet);
info.addMember(m_keyframesRuleMap);
info.addMember(m_matchedPropertiesCache);
+ info.addMember(m_matchedPropertiesCacheSweepTimer);
info.addMember(m_matchedRules);
info.addMember(m_ruleList);
info.addMember(m_pendingImageProperties);
+ info.addMember(m_medium);
+ info.addMember(m_rootDefaultStyle);
+ info.addMember(m_document);
+
+ // FIXME: pointer to RenderStyle could point to an already deleted object.
+ info.ignoreMember(m_parentStyle);
+ info.ignoreMember(m_rootElementStyle);
+
+ info.addMember(m_element);
+ info.addMember(m_styledElement);
+ info.addMember(m_regionForStyling);
+ info.addMember(m_parentNode);
info.addMember(m_lineHeightValue);
+ info.addMember(m_fontSelector);
info.addMember(m_viewportDependentMediaQueryResults);
+ info.ignoreMember(m_styleBuilder);
info.addMember(m_styleRuleToCSSOMWrapperMap);
info.addMember(m_styleSheetCSSOMWrapperSet);
#if ENABLE(CSS_FILTERS) && ENABLE(SVG)
Modified: trunk/Source/WebCore/css/StyleSheetContents.cpp (139588 => 139589)
--- trunk/Source/WebCore/css/StyleSheetContents.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/css/StyleSheetContents.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -512,11 +512,13 @@
void StyleSheetContents::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
+ info.addMember(m_ownerRule);
info.addMember(m_originalURL);
info.addMember(m_encodingFromCharsetRule);
info.addMember(m_importRules);
info.addMember(m_childRules);
info.addMember(m_namespaces);
+ info.addMember(m_parserContext);
info.addMember(m_clients);
}
Modified: trunk/Source/WebCore/dom/TreeScope.cpp (139588 => 139589)
--- trunk/Source/WebCore/dom/TreeScope.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/dom/TreeScope.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -378,6 +378,8 @@
info.addMember(m_labelsByForAttribute);
info.addMember(m_idTargetObserverRegistry);
info.addMember(m_selection);
+ info.addMember(m_documentScope);
+
}
static void listTreeScopes(Node* node, Vector<TreeScope*, 5>& treeScopes)
Modified: trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp (139588 => 139589)
--- trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -197,6 +197,7 @@
info.addMember(m_baseToRealAddress);
info.addMember(m_nodes);
info.addMember(m_edges);
+ info.addMember(m_roots);
}
int HeapGraphSerializer::addString(const String& string)
Modified: trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp (139588 => 139589)
--- trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -388,6 +388,7 @@
m_memoryClassInfo = &info;
ScriptProfiler::visitExternalStrings(const_cast<ExternalStringsRoot*>(this));
m_memoryClassInfo = 0;
+ info.ignoreMember(m_memoryClassInfo);
}
private:
@@ -409,6 +410,7 @@
m_memoryClassInfo = &info;
ScriptProfiler::visitExternalArrays(const_cast<ExternalArraysRoot*>(this));
m_memoryClassInfo = 0;
+ info.ignoreMember(m_memoryClassInfo);
}
private:
Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp (139588 => 139589)
--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -499,6 +499,7 @@
info.addWeakPointer(m_frontend);
info.addMember(m_profiles);
info.addMember(m_snapshots);
+ info.addMember(m_profileNameIdleTimeMap);
}
void InspectorProfilerAgent::willProcessTask()
Modified: trunk/Source/WebCore/inspector/MemoryInstrumentationImpl.cpp (139588 => 139589)
--- trunk/Source/WebCore/inspector/MemoryInstrumentationImpl.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/inspector/MemoryInstrumentationImpl.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -126,6 +126,7 @@
info.addMember(m_visitedObjects);
info.addMember(m_allocatedObjects);
info.addMember(m_countedObjects);
+ info.addMember(m_graphSerializer);
}
void MemoryInstrumentationImpl::processDeferredObjects()
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (139588 => 139589)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -360,7 +360,9 @@
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
info.addMember(m_frame);
+ info.addMember(m_cachedResourceLoader);
info.addMember(m_mainResourceLoader);
+ info.addMember(m_mainResourceData);
info.addMember(m_subresourceLoaders);
info.addMember(m_multipartSubresourceLoaders);
info.addMember(m_plugInStreamLoaders);
@@ -375,10 +377,18 @@
info.addMember(m_lastCheckedRequest);
info.addMember(m_responses);
info.addMember(m_pendingSubstituteResources);
+ info.addMember(m_substituteResourceDeliveryTimer);
+ info.addMember(m_archiveResourceCollection);
+#if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
+ info.addMember(m_archive);
+ info.addMember(m_parsedArchiveData);
+#endif
info.addMember(m_resourcesClientKnowsAbout);
info.addMember(m_resourcesLoadedFromMemoryCacheForClientNotification);
info.addMember(m_clientRedirectSourceForHistory);
- info.addMember(m_mainResourceData);
+ info.addMember(m_iconLoadDecisionCallback);
+ info.addMember(m_iconDataCallback);
+ info.addMember(m_applicationCacheHost);
}
void DocumentLoader::receivedData(const char* data, int length)
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (139588 => 139589)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -3291,11 +3291,21 @@
void FrameLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
+ info.addMember(m_frame);
+ info.ignoreMember(m_client);
+ info.addMember(m_progressTracker);
info.addMember(m_documentLoader);
info.addMember(m_provisionalDocumentLoader);
info.addMember(m_policyDocumentLoader);
+ info.addMember(m_pendingStateObject);
+ info.addMember(m_submittedFormURL);
+ info.addMember(m_checkTimer);
+ info.addMember(m_opener);
+ info.addMember(m_openedFrames);
info.addMember(m_outgoingReferrer);
- info.addMember(m_openedFrames);
+ info.addMember(m_networkingContext);
+ info.addMember(m_previousUrl);
+ info.addMember(m_requestedHistoryItem);
}
bool FrameLoaderClient::hasHTMLView() const
Modified: trunk/Source/WebCore/loader/MainResourceLoader.cpp (139588 => 139589)
--- trunk/Source/WebCore/loader/MainResourceLoader.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/loader/MainResourceLoader.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -602,9 +602,11 @@
void MainResourceLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
+ info.addMember(m_resource);
info.addMember(m_initialRequest);
info.addMember(m_substituteData);
info.addMember(m_dataLoadTimer);
+ info.addMember(m_documentLoader);
}
void MainResourceLoader::handleSubstituteDataLoadNow(MainResourceLoaderTimer*)
Modified: trunk/Source/WebCore/loader/Prerenderer.cpp (139588 => 139589)
--- trunk/Source/WebCore/loader/Prerenderer.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/loader/Prerenderer.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -148,6 +148,7 @@
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
ActiveDOMObject::reportMemoryUsage(memoryObjectInfo);
+ info.ignoreMember(m_client);
info.addMember(m_activeHandles);
info.addMember(m_suspendedHandles);
}
Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (139588 => 139589)
--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -539,7 +539,7 @@
void ResourceLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
- info.addMember(m_handle.get());
+ info.addMember(m_handle);
info.addMember(m_frame);
info.addMember(m_documentLoader);
info.addMember(m_request);
Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (139588 => 139589)
--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -39,6 +39,7 @@
#include "Settings.h"
#include "SubresourceLoader.h"
#include <wtf/CurrentTime.h>
+#include <wtf/MemoryInstrumentationHashMap.h>
#include <wtf/MemoryObjectInfo.h>
#include <wtf/StdLibExtras.h>
#include <wtf/Vector.h>
@@ -489,6 +490,7 @@
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResourceImage);
memoryObjectInfo->setClassName("CachedImage");
CachedResource::reportMemoryUsage(memoryObjectInfo);
+ info.addMember(m_pendingContainerSizeRequests);
info.addMember(m_image, "m_image");
#if ENABLE(SVG)
info.addMember(m_svgImageCache);
Modified: trunk/Source/WebCore/page/Page.cpp (139588 => 139589)
--- trunk/Source/WebCore/page/Page.cpp 2013-01-14 07:18:36 UTC (rev 139588)
+++ trunk/Source/WebCore/page/Page.cpp 2013-01-14 08:21:49 UTC (rev 139589)
@@ -1373,6 +1373,7 @@
info.ignoreMember(m_debugger);
info.ignoreMember(m_alternativeTextClient);
info.ignoreMember(m_editorClient);
+ info.ignoreMember(m_plugInClient);
info.ignoreMember(m_validationMessageClient);
}
