diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/css/CSSFunctionValue.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/css/CSSFunctionValue.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSFunctionValue.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Source/WebCore/css/CSSFunctionValue.cpp b/Source/WebCore/css/CSSFunctionValue.cpp index bc270de68..d363cf10d 100644 --- a/Source/WebCore/css/CSSFunctionValue.cpp +++ b/Source/WebCore/css/CSSFunctionValue.cpp @@ -28,7 +28,6 @@ #include "CSSParserValues.h" #include "CSSValueList.h" -#include "WebCoreMemoryInstrumentation.h" #include <wtf/PassOwnPtr.h> #include <wtf/text/StringBuilder.h> @@ -42,6 +41,13 @@ CSSFunctionValue::CSSFunctionValue(CSSParserFunction* function) m_args = CSSValueList::createFromParserValueList(function->args.get()); } +CSSFunctionValue::CSSFunctionValue(String name, PassRefPtr<CSSValueList> args) + : CSSValue(FunctionClass) + , m_name(name) + , m_args(args) +{ +} + String CSSFunctionValue::customCssText() const { StringBuilder result; @@ -52,11 +58,9 @@ String CSSFunctionValue::customCssText() const return result.toString(); } -void CSSFunctionValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const +bool CSSFunctionValue::equals(const CSSFunctionValue& other) const { - MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); - info.addMember(m_name); - info.addMember(m_args); + return m_name == other.m_name && compareCSSValuePtr(m_args, other.m_args); } } |