Changeset 129466 in webkit for trunk/Source/WebCore/css/CSSImageSetValue.cpp

Timestamp:

Sep 25, 2012, 12:54:44 AM (13 years ago)

Author:

[email protected]

Message:

Web Inspector: extract Vector instrumentation from core NMI code into MemoryInstrumentationVector.h header.
​https://bugs.webkit.org/show_bug.cgi?id=96650

Reviewed by Vsevolod Vlasov.

Source/WebCore:

addInstrumentedVector and addInstrumentedVectorPtr were replaced with addMember.
The same thing happens with addVector and addVectorPtr.

• css/CSSGradientValue.cpp:

(WebCore::CSSGradientValue::reportBaseClassMemoryUsage):

• css/CSSImageSetValue.cpp:

(WebCore::CSSImageSetValue::reportDescendantMemoryUsage):

• css/CSSMediaRule.cpp:

(WebCore::CSSMediaRule::reportDescendantMemoryUsage):

• css/CSSRuleList.cpp:

(WebCore::StaticCSSRuleList::reportMemoryUsage):

• css/CSSStyleSheet.cpp:

(WebCore::CSSStyleSheet::reportMemoryUsage):

• css/CSSValueList.cpp:

(WebCore::CSSValueList::reportDescendantMemoryUsage):

• css/MediaList.cpp:

(WebCore::MediaQuerySet::reportMemoryUsage):

• css/MediaQuery.cpp:

(WebCore::MediaQuery::reportMemoryUsage):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::collectMatchingRulesForList):

• css/StyleRule.cpp:

(WebCore::StyleRuleBlock::reportDescendantMemoryUsage):

• css/StyleSheetContents.cpp:

(WebCore::StyleSheetContents::reportMemoryUsage):

• css/WebKitCSSKeyframesRule.cpp:

(WebCore::StyleRuleKeyframes::reportDescendantMemoryUsage):
(WebCore::WebKitCSSKeyframesRule::reportDescendantMemoryUsage):

• css/WebKitCSSRegionRule.cpp:

(WebCore::WebKitCSSRegionRule::reportDescendantMemoryUsage):

• dom/Document.cpp:

(WebCore::Document::reportMemoryUsage):

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::reportMemoryUsage):

• platform/network/ResourceRequestBase.cpp:

(WebCore::ResourceRequestBase::reportMemoryUsage):

Source/WebKit/chromium:

Test for instrumented vector.

• tests/MemoryInstrumentationTest.cpp:

(WebCore::InstrumentedOwner::InstrumentedOwner):
(WebCore::TEST):
(WebCore):

Source/WTF:

Added reportMemoryUsage free template function with default body to core NMI code
and add custom version of reportMemoryUsage function for Vectors.

• GNUmakefile.list.am:
• WTF.gypi:
• WTF.pro:
• WTF.vcproj/WTF.vcproj:
• WTF.xcodeproj/project.pbxproj:
• wtf/MemoryInstrumentation.h:

(WTF):
(MemoryInstrumentation):
(WTF::MemoryInstrumentation::addObjectImpl):

• wtf/MemoryInstrumentationVector.h: Added.

(WTF):
(WTF::instrumentVectorValues):
(WTF::reportMemoryUsage):

File:

• trunk/Source/WebCore/css/CSSImageSetValue.cpp (modified) (2 diffs)

trunk/Source/WebCore/css/CSSImageSetValue.cpp

@@ -38 +38 @@
 #include "StylePendingImage.h"
 #include "WebCoreMemoryInstrumentation.h"
+#include <wtf/MemoryInstrumentationVector.h>
 
 namespace WebCore {
@@ -169 +170 @@
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
     CSSValueList::reportDescendantMemoryUsage(memoryObjectInfo);
-    info.addInstrumentedVector(m_imagesInSet);
+    info.addMember(m_imagesInSet);
 }