diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
| commit | 284837daa07b29d6a63a748544a90b1f5842ac5c (patch) | |
| tree | ecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/WebCore/css/CSSValue.cpp | |
| parent | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff) | |
| download | qtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz | |
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/WebCore/css/CSSValue.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSValue.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Source/WebCore/css/CSSValue.cpp b/Source/WebCore/css/CSSValue.cpp index ee0a18cf5..f5ef1ef41 100644 --- a/Source/WebCore/css/CSSValue.cpp +++ b/Source/WebCore/css/CSSValue.cpp @@ -52,10 +52,11 @@ #endif #include "FontValue.h" #include "FontFeatureValue.h" -#include "MemoryInstrumentation.h" #include "ShadowValue.h" #include "SVGColor.h" #include "SVGPaint.h" +#include "WebCoreMemoryInstrumentation.h" +#include "WebKitCSSArrayFunctionValue.h" #include "WebKitCSSFilterValue.h" #include "WebKitCSSMixFunctionValue.h" #include "WebKitCSSShaderValue.h" @@ -81,7 +82,7 @@ public: void reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { - MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); info.addInstrumentedMember(m_cssText); } @@ -229,6 +230,9 @@ void CSSValue::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const static_cast<const CSSCalcValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); return; #if ENABLE(CSS_FILTERS) && ENABLE(CSS_SHADERS) + case WebKitCSSArrayFunctionValueClass: + static_cast<const WebKitCSSArrayFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); + return; case WebKitCSSMixFunctionValueClass: static_cast<const WebKitCSSMixFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); return; @@ -339,6 +343,8 @@ String CSSValue::cssText() const case WebKitCSSFilterClass: return static_cast<const WebKitCSSFilterValue*>(this)->customCssText(); #if ENABLE(CSS_SHADERS) + case WebKitCSSArrayFunctionValueClass: + return static_cast<const WebKitCSSArrayFunctionValue*>(this)->customCssText(); case WebKitCSSMixFunctionValueClass: return static_cast<const WebKitCSSMixFunctionValue*>(this)->customCssText(); case WebKitCSSShaderClass: @@ -473,6 +479,9 @@ void CSSValue::destroy() delete static_cast<WebKitCSSFilterValue*>(this); return; #if ENABLE(CSS_SHADERS) + case WebKitCSSArrayFunctionValueClass: + delete static_cast<WebKitCSSArrayFunctionValue*>(this); + return; case WebKitCSSMixFunctionValueClass: delete static_cast<WebKitCSSMixFunctionValue*>(this); return; @@ -515,6 +524,8 @@ PassRefPtr<CSSValue> CSSValue::cloneForCSSOM() const case WebKitCSSFilterClass: return static_cast<const WebKitCSSFilterValue*>(this)->cloneForCSSOM(); #if ENABLE(CSS_SHADERS) + case WebKitCSSArrayFunctionValueClass: + return static_cast<const WebKitCSSArrayFunctionValue*>(this)->cloneForCSSOM(); case WebKitCSSMixFunctionValueClass: return static_cast<const WebKitCSSMixFunctionValue*>(this)->cloneForCSSOM(); #endif |