Title: [139590] trunk/Source/WebCore
- Revision
- 139590
- Author
- [email protected]
- Date
- 2013-01-14 01:12:30 -0800 (Mon, 14 Jan 2013)
Log Message
Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 3/3
https://bugs.webkit.org/show_bug.cgi?id=106764
Reviewed by Vsevolod Vlasov.
Last three classes with not instrumented members were fixed.
* css/CSSGroupingRule.cpp:
(WebCore::CSSGroupingRule::reportMemoryUsage):
* css/StyleScopeResolver.cpp:
(WebCore::StyleScopeResolver::reportMemoryUsage):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::reportMemoryUsage):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (139589 => 139590)
--- trunk/Source/WebCore/ChangeLog 2013-01-14 08:21:49 UTC (rev 139589)
+++ trunk/Source/WebCore/ChangeLog 2013-01-14 09:12:30 UTC (rev 139590)
@@ -1,3 +1,19 @@
+2013-01-14 Ilya Tikhonovsky <[email protected]>
+
+ Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 3/3
+ https://bugs.webkit.org/show_bug.cgi?id=106764
+
+ Reviewed by Vsevolod Vlasov.
+
+ Last three classes with not instrumented members were fixed.
+
+ * css/CSSGroupingRule.cpp:
+ (WebCore::CSSGroupingRule::reportMemoryUsage):
+ * css/StyleScopeResolver.cpp:
+ (WebCore::StyleScopeResolver::reportMemoryUsage):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::reportMemoryUsage):
+
2013-01-10 Ilya Tikhonovsky <[email protected]>
Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 2/N
Modified: trunk/Source/WebCore/css/CSSGroupingRule.cpp (139589 => 139590)
--- trunk/Source/WebCore/css/CSSGroupingRule.cpp 2013-01-14 08:21:49 UTC (rev 139589)
+++ trunk/Source/WebCore/css/CSSGroupingRule.cpp 2013-01-14 09:12:30 UTC (rev 139590)
@@ -164,6 +164,7 @@
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
CSSRule::reportMemoryUsage(memoryObjectInfo);
+ info.addMember(m_groupRule);
info.addMember(m_childRuleCSSOMWrappers);
info.addMember(m_ruleListCSSOMWrapper);
}
Modified: trunk/Source/WebCore/css/StyleScopeResolver.cpp (139589 => 139590)
--- trunk/Source/WebCore/css/StyleScopeResolver.cpp 2013-01-14 08:21:49 UTC (rev 139589)
+++ trunk/Source/WebCore/css/StyleScopeResolver.cpp 2013-01-14 09:12:30 UTC (rev 139590)
@@ -244,6 +244,7 @@
info.addMember(m_authorStyles);
info.addMember(m_stack);
info.addMember(m_atHostRules);
+ info.addMember(m_stackParent);
}
}
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (139589 => 139590)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2013-01-14 08:21:49 UTC (rev 139589)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2013-01-14 09:12:30 UTC (rev 139590)
@@ -946,9 +946,17 @@
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
info.addMember(m_documentResources);
+ info.addMember(m_document);
+ info.addMember(m_documentLoader);
info.addMember(m_validatedURLs);
info.addMember(m_preloads);
info.addMember(m_pendingPreloads);
+ info.addMember(m_garbageCollectDocumentResourcesTimer);
+#if ENABLE(RESOURCE_TIMING)
+ // FIXME: m_initiatorMap has pointers to already deleted CachedResources
+ info.ignoreMember(m_initiatorMap);
+#endif
+
}
const ResourceLoaderOptions& CachedResourceLoader::defaultCachedResourceOptions()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
