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/ShadowValue.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/ShadowValue.cpp')
-rw-r--r-- | Source/WebCore/css/ShadowValue.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Source/WebCore/css/ShadowValue.cpp b/Source/WebCore/css/ShadowValue.cpp index a4064cc10..0d314be56 100644 --- a/Source/WebCore/css/ShadowValue.cpp +++ b/Source/WebCore/css/ShadowValue.cpp @@ -21,7 +21,6 @@ #include "ShadowValue.h" #include "CSSPrimitiveValue.h" -#include "WebCoreMemoryInstrumentation.h" #include <wtf/text/StringBuilder.h> #include <wtf/text/WTFString.h> @@ -79,15 +78,14 @@ String ShadowValue::customCssText() const return text.toString(); } -void ShadowValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const +bool ShadowValue::equals(const ShadowValue& other) const { - MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); - info.addMember(x); - info.addMember(y); - info.addMember(blur); - info.addMember(spread); - info.addMember(style); - info.addMember(color); + return compareCSSValuePtr(color, other.color) + && compareCSSValuePtr(x, other.x) + && compareCSSValuePtr(y, other.y) + && compareCSSValuePtr(blur, other.blur) + && compareCSSValuePtr(spread, other.spread) + && compareCSSValuePtr(style, other.style); } } |