Index: Source/core/css/CSSValue.cpp |
diff --git a/Source/core/css/CSSValue.cpp b/Source/core/css/CSSValue.cpp |
index dfb1735680e5acc4da13bbfb27f3bf45ea934ab4..68f027624c9e780b69d3bc2ee96f4bdcd1e32c27 100644 |
--- a/Source/core/css/CSSValue.cpp |
+++ b/Source/core/css/CSSValue.cpp |
@@ -53,7 +53,6 @@ |
#include "ShadowValue.h" |
#include "SVGColor.h" |
#include "SVGPaint.h" |
-#include "WebCoreMemoryInstrumentation.h" |
#include "WebKitCSSArrayFunctionValue.h" |
#include "WebKitCSSFilterValue.h" |
#include "WebKitCSSMixFunctionValue.h" |
@@ -78,12 +77,6 @@ public: |
String cssText() const { return m_cssText; } |
- void reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
- { |
- MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); |
- info.addMember(m_cssText, "cssText"); |
- } |
- |
private: |
TextCloneCSSValue(ClassType classType, const String& text) |
: CSSValue(classType, /*isCSSOMSafe*/ true) |
@@ -148,126 +141,6 @@ bool CSSValue::hasFailedOrCanceledSubresources() const |
return false; |
} |
-void CSSValue::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
-{ |
- if (m_isTextClone) { |
- ASSERT(isCSSOMSafe()); |
- static_cast<const TextCloneCSSValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- } |
- |
- ASSERT(!isCSSOMSafe() || isSubtypeExposedToCSSOM()); |
- switch (classType()) { |
- case PrimitiveClass: |
- static_cast<const CSSPrimitiveValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case ImageClass: |
- static_cast<const CSSImageValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case CursorImageClass: |
- static_cast<const CSSCursorImageValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case CanvasClass: |
- static_cast<const CSSCanvasValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case CrossfadeClass: |
- static_cast<const CSSCrossfadeValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case LinearGradientClass: |
- static_cast<const CSSLinearGradientValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case RadialGradientClass: |
- static_cast<const CSSRadialGradientValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case CubicBezierTimingFunctionClass: |
- static_cast<const CSSCubicBezierTimingFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case LinearTimingFunctionClass: |
- static_cast<const CSSLinearTimingFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case StepsTimingFunctionClass: |
- static_cast<const CSSStepsTimingFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case AspectRatioClass: |
- static_cast<const CSSAspectRatioValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case BorderImageSliceClass: |
- static_cast<const CSSBorderImageSliceValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case FontFeatureClass: |
- static_cast<const FontFeatureValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case FontClass: |
- static_cast<const FontValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case FontFaceSrcClass: |
- static_cast<const CSSFontFaceSrcValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case FunctionClass: |
- static_cast<const CSSFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case InheritedClass: |
- static_cast<const CSSInheritedValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case InitialClass: |
- static_cast<const CSSInitialValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case ReflectClass: |
- static_cast<const CSSReflectValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case ShadowClass: |
- static_cast<const ShadowValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case UnicodeRangeClass: |
- static_cast<const CSSUnicodeRangeValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case LineBoxContainClass: |
- static_cast<const CSSLineBoxContainValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case CalculationClass: |
- static_cast<const CSSCalcValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case WebKitCSSArrayFunctionValueClass: |
- static_cast<const WebKitCSSArrayFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case WebKitCSSMixFunctionValueClass: |
- static_cast<const WebKitCSSMixFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case WebKitCSSShaderClass: |
- static_cast<const WebKitCSSShaderValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case VariableClass: |
- static_cast<const CSSVariableValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
-#if ENABLE(SVG) |
- case SVGColorClass: |
- static_cast<const SVGColor*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case SVGPaintClass: |
- static_cast<const SVGPaint*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case WebKitCSSSVGDocumentClass: |
- static_cast<const WebKitCSSSVGDocumentValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
-#endif |
- case ValueListClass: |
- static_cast<const CSSValueList*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
-#if ENABLE(CSS_IMAGE_SET) |
- case ImageSetClass: |
- static_cast<const CSSImageSetValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
-#endif |
- case WebKitCSSFilterClass: |
- static_cast<const WebKitCSSFilterValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- case WebKitCSSTransformClass: |
- static_cast<const WebKitCSSTransformValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); |
- return; |
- } |
- ASSERT_NOT_REACHED(); |
-} |
- |
template<class ChildClassType> |
inline static bool compareCSSValues(const CSSValue& first, const CSSValue& second) |
{ |