diff options
Diffstat (limited to 'Source/WebCore/css/CSSFontFaceSrcValue.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSFontFaceSrcValue.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Source/WebCore/css/CSSFontFaceSrcValue.cpp b/Source/WebCore/css/CSSFontFaceSrcValue.cpp index db4eb9b36..0505f60ad 100644 --- a/Source/WebCore/css/CSSFontFaceSrcValue.cpp +++ b/Source/WebCore/css/CSSFontFaceSrcValue.cpp @@ -29,10 +29,11 @@ #include "CachedResourceLoader.h" #include "Document.h" #include "FontCustomPlatformData.h" -#include "MemoryInstrumentation.h" #include "Node.h" #include "SVGFontFaceElement.h" #include "StyleSheetContents.h" +#include "WebCoreMemoryInstrumentation.h" +#include <wtf/text/StringBuilder.h> namespace WebCore { @@ -63,16 +64,19 @@ bool CSSFontFaceSrcValue::isSupportedFormat() const String CSSFontFaceSrcValue::customCssText() const { - String result; + StringBuilder result; if (isLocal()) - result += "local("; + result.appendLiteral("local("); else - result += "url("; - result += m_resource; - result += ")"; - if (!m_format.isEmpty()) - result += " format(" + m_format + ")"; - return result; + result.appendLiteral("url("); + result.append(m_resource); + result.append(')'); + if (!m_format.isEmpty()) { + result.appendLiteral(" format("); + result.append(m_format); + result.append(')'); + } + return result.toString(); } void CSSFontFaceSrcValue::addSubresourceStyleURLs(ListHashSet<KURL>& urls, const StyleSheetContents* styleSheet) const @@ -99,7 +103,7 @@ CachedFont* CSSFontFaceSrcValue::cachedFont(Document* document) void CSSFontFaceSrcValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { - MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); info.addInstrumentedMember(m_resource); info.addInstrumentedMember(m_format); // FIXME: add m_cachedFont when MemoryCache is instrumented. |