Index: Source/core/css/StyleRule.cpp |
diff --git a/Source/core/css/StyleRule.cpp b/Source/core/css/StyleRule.cpp |
index c7711907920cc398afddad3e456dbcdc8d34452e..475c4cc774c5ac45fb24b0c052999ca774a4d203 100644 |
--- a/Source/core/css/StyleRule.cpp |
+++ b/Source/core/css/StyleRule.cpp |
@@ -33,13 +33,11 @@ |
#include "CSSUnknownRule.h" |
#include "StylePropertySet.h" |
#include "StyleRuleImport.h" |
-#include "WebCoreMemoryInstrumentation.h" |
#include "WebKitCSSFilterRule.h" |
#include "WebKitCSSKeyframeRule.h" |
#include "WebKitCSSKeyframesRule.h" |
#include "WebKitCSSRegionRule.h" |
#include "WebKitCSSViewportRule.h" |
-#include <wtf/MemoryInstrumentationVector.h> |
namespace WebCore { |
@@ -59,56 +57,6 @@ PassRefPtr<CSSRule> StyleRuleBase::createCSSOMWrapper(CSSRule* parentRule) const |
return createCSSOMWrapper(0, parentRule); |
} |
-void StyleRuleBase::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
-{ |
- switch (type()) { |
- case Style: |
- static_cast<const StyleRule*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case Page: |
- static_cast<const StyleRulePage*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case FontFace: |
- static_cast<const StyleRuleFontFace*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case Media: |
- static_cast<const StyleRuleMedia*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
-#if ENABLE(CSS_REGIONS) |
- case Region: |
- static_cast<const StyleRuleRegion*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
-#endif |
- case Import: |
- static_cast<const StyleRuleImport*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case Keyframes: |
- static_cast<const StyleRuleKeyframes*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case Supports: |
- case HostInternal: |
- static_cast<const StyleRuleHost*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
-#if ENABLE(CSS_DEVICE_ADAPTATION) |
- case Viewport: |
- static_cast<const StyleRuleViewport*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
-#endif |
- case Filter: |
- static_cast<const StyleRuleFilter*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case Unknown: |
- case Charset: |
- case Keyframe: |
-#if !ENABLE(CSS_REGIONS) |
- case Region: |
-#endif |
- ASSERT_NOT_REACHED(); |
- return; |
- } |
- ASSERT_NOT_REACHED(); |
-} |
- |
void StyleRuleBase::destroy() |
{ |
switch (type()) { |
@@ -266,13 +214,6 @@ unsigned StyleRule::averageSizeInBytes() |
return sizeof(StyleRule) + sizeof(CSSSelector) + StylePropertySet::averageSizeInBytes(); |
} |
-void StyleRule::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
-{ |
- MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); |
- info.addMember(m_properties, "properties"); |
- info.addMember(m_selectorList, "selectorList"); |
-} |
- |
StyleRule::StyleRule(int sourceLine) |
: StyleRuleBase(Style, sourceLine) |
{ |
@@ -329,13 +270,6 @@ void StyleRulePage::setProperties(PassRefPtr<StylePropertySet> properties) |
m_properties = properties; |
} |
-void StyleRulePage::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
-{ |
- MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); |
- info.addMember(m_properties, "properties"); |
- info.addMember(m_selectorList, "selectorList"); |
-} |
- |
StyleRuleFontFace::StyleRuleFontFace() |
: StyleRuleBase(FontFace, 0) |
{ |
@@ -363,12 +297,6 @@ void StyleRuleFontFace::setProperties(PassRefPtr<StylePropertySet> properties) |
m_properties = properties; |
} |
-void StyleRuleFontFace::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
-{ |
- MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); |
- info.addMember(m_properties, "properties"); |
-} |
- |
StyleRuleGroup::StyleRuleGroup(Type type, Vector<RefPtr<StyleRuleBase> >& adoptRule) |
: StyleRuleBase(type, 0) |
@@ -394,11 +322,6 @@ void StyleRuleGroup::wrapperRemoveRule(unsigned index) |
m_childRules.remove(index); |
} |
-void StyleRuleGroup::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
-{ |
- MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); |
- info.addMember(m_childRules, "childRules"); |
-} |
StyleRuleMedia::StyleRuleMedia(PassRefPtr<MediaQuerySet> media, Vector<RefPtr<StyleRuleBase> >& adoptRules) |
: StyleRuleGroup(Media, adoptRules) |
@@ -413,12 +336,6 @@ StyleRuleMedia::StyleRuleMedia(const StyleRuleMedia& o) |
m_mediaQueries = o.m_mediaQueries->copy(); |
} |
-void StyleRuleMedia::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
-{ |
- MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); |
- info.addMember(m_mediaQueries, "mediaQueries"); |
-} |
- |
StyleRuleSupports::StyleRuleSupports(const String& conditionText, bool conditionIsSupported, Vector<RefPtr<StyleRuleBase> >& adoptRules) |
: StyleRuleGroup(Supports, adoptRules) |
@@ -446,11 +363,6 @@ StyleRuleRegion::StyleRuleRegion(const StyleRuleRegion& o) |
{ |
} |
-void StyleRuleRegion::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
-{ |
- MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); |
- info.addMember(m_selectorList, "selectorList"); |
-} |
#if ENABLE(CSS_DEVICE_ADAPTATION) |
StyleRuleViewport::StyleRuleViewport() |
@@ -479,12 +391,6 @@ void StyleRuleViewport::setProperties(PassRefPtr<StylePropertySet> properties) |
{ |
m_properties = properties; |
} |
- |
-void StyleRuleViewport::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
-{ |
- MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); |
- info.addMember(m_properties, "properties"); |
-} |
#endif // ENABLE(CSS_DEVICE_ADAPTATION) |
StyleRuleFilter::StyleRuleFilter(const String& filterName) |
@@ -516,11 +422,4 @@ void StyleRuleFilter::setProperties(PassRefPtr<StylePropertySet> properties) |
m_properties = properties; |
} |
-void StyleRuleFilter::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
-{ |
- MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); |
- info.addMember(m_filterName); |
- info.addMember(m_properties); |
-} |
- |
} // namespace WebCore |