From 3749d61e1f7a59f5ec5067e560af1eb610c82015 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sun, 12 Aug 2012 09:27:39 +0200 Subject: Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365) New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream --- Source/WebCore/css/CSSCalculationValue.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'Source/WebCore/css/CSSCalculationValue.cpp') diff --git a/Source/WebCore/css/CSSCalculationValue.cpp b/Source/WebCore/css/CSSCalculationValue.cpp index 54247e035..5a10c5985 100755 --- a/Source/WebCore/css/CSSCalculationValue.cpp +++ b/Source/WebCore/css/CSSCalculationValue.cpp @@ -33,6 +33,7 @@ #include "CSSValueList.h" #include "Length.h" +#include "MemoryInstrumentation.h" #include "StyleResolver.h" #include @@ -86,6 +87,11 @@ String CSSCalcValue::customCssText() const result.append(')'); return result.toString(); } + +void CSSCalcValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const +{ + MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); +} double CSSCalcValue::clampToPermittedRange(double value) const { @@ -175,6 +181,12 @@ public: } return 0; } + + virtual void reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const OVERRIDE + { + MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + info.addInstrumentedMember(m_value); + } private: explicit CSSCalcPrimitiveValue(CSSPrimitiveValue* value, bool isInteger) @@ -260,6 +272,13 @@ public: return evaluate(leftValue, rightValue); } + virtual void reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const OVERRIDE + { + MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + info.addInstrumentedMember(m_leftSide); + info.addInstrumentedMember(m_rightSide); + } + virtual String customCssText() const { StringBuilder result; -- cgit v1.2.1