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/CSSFontFaceSrcValue.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/CSSFontFaceSrcValue.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSFontFaceSrcValue.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Source/WebCore/css/CSSFontFaceSrcValue.cpp b/Source/WebCore/css/CSSFontFaceSrcValue.cpp index 0d1fa108b..bfdb7a741 100644 --- a/Source/WebCore/css/CSSFontFaceSrcValue.cpp +++ b/Source/WebCore/css/CSSFontFaceSrcValue.cpp @@ -34,7 +34,6 @@ #include "Node.h" #include "SVGFontFaceElement.h" #include "StyleSheetContents.h" -#include "WebCoreMemoryInstrumentation.h" #include <wtf/text/StringBuilder.h> namespace WebCore { @@ -104,15 +103,9 @@ CachedFont* CSSFontFaceSrcValue::cachedFont(Document* document) return m_cachedFont.get(); } -void CSSFontFaceSrcValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const +bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const { - MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); - info.addMember(m_resource); - info.addMember(m_format); - // FIXME: add m_cachedFont when MemoryCache is instrumented. -#if ENABLE(SVG_FONTS) - info.addMember(m_svgFontFaceElement); -#endif + return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resource == other.m_resource; } } |