Changeset 139590 in webkit

Timestamp:

Jan 14, 2013 1:12:30 AM (11 years ago)

Author:

loislo@chromium.org

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSGroupingRule.cpp (modified) (1 diff)
• css/StyleScopeResolver.cpp (modified) (1 diff)
• loader/cache/CachedResourceLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-14  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        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  <loislo@chromium.org>
 

trunk/Source/WebCore/css/CSSGroupingRule.cpp

@@ -165 +165 @@
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
     CSSRule::reportMemoryUsage(memoryObjectInfo);
+    info.addMember(m_groupRule);
     info.addMember(m_childRuleCSSOMWrappers);
     info.addMember(m_ruleListCSSOMWrapper);

trunk/Source/WebCore/css/StyleScopeResolver.cpp

@@ -245 +245 @@
     info.addMember(m_stack);
     info.addMember(m_atHostRules);
+    info.addMember(m_stackParent);
 }
 

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -947 +947 @@
     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
+
 }