From 284837daa07b29d6a63a748544a90b1f5842ac5c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 10 Sep 2012 19:10:20 +0200 Subject: Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073) New snapshot --- Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp') diff --git a/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp b/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp index 5fc2d3803..6093cf814 100644 --- a/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp +++ b/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp @@ -26,12 +26,12 @@ #include "CSSStyleSheet.h" #include "HTMLNames.h" #include "InspectorInstrumentation.h" -#include "MemoryInstrumentation.h" #include "MutationObserverInterestGroup.h" #include "MutationRecord.h" #include "StylePropertySet.h" #include "StyledElement.h" #include "UndoManager.h" +#include "WebCoreMemoryInstrumentation.h" using namespace std; @@ -171,7 +171,7 @@ void PropertySetCSSStyleDeclaration::deref() void PropertySetCSSStyleDeclaration::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { - MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); info.addInstrumentedMember(m_propertySet); if (m_cssomCSSValueClones) info.addInstrumentedMapEntries(*m_cssomCSSValueClones); @@ -430,14 +430,14 @@ void StyleRuleCSSStyleDeclaration::reattach(StylePropertySet* propertySet) void StyleRuleCSSStyleDeclaration::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { - MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); PropertySetCSSStyleDeclaration::reportMemoryUsage(memoryObjectInfo); info.addInstrumentedMember(m_parentRule); } void InlineCSSStyleDeclaration::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { - MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); PropertySetCSSStyleDeclaration::reportMemoryUsage(memoryObjectInfo); info.addInstrumentedMember(m_parentElement); } -- cgit v1.2.1