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/FontValue.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/FontValue.cpp')
| -rw-r--r-- | Source/WebCore/css/FontValue.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Source/WebCore/css/FontValue.cpp b/Source/WebCore/css/FontValue.cpp index 0ba1e6e98..fcacc14ba 100644 --- a/Source/WebCore/css/FontValue.cpp +++ b/Source/WebCore/css/FontValue.cpp @@ -22,7 +22,6 @@ #include "CSSValueList.h" #include "CSSPrimitiveValue.h" -#include "WebCoreMemoryInstrumentation.h" #include <wtf/text/StringBuilder.h> namespace WebCore { @@ -65,15 +64,14 @@ String FontValue::customCssText() const return result.toString(); } -void FontValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const +bool FontValue::equals(const FontValue& other) const { - MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); - info.addMember(style); - info.addMember(variant); - info.addMember(weight); - info.addMember(size); - info.addMember(lineHeight); - info.addMember(family); + return compareCSSValuePtr(style, other.style) + && compareCSSValuePtr(variant, other.variant) + && compareCSSValuePtr(weight, other.weight) + && compareCSSValuePtr(size, other.size) + && compareCSSValuePtr(lineHeight, other.lineHeight) + && compareCSSValuePtr(family, other.family); } } |