From 284837daa07b29d6a63a748544a90b1f5842ac5c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 10 Sep 2012 19:10:20 +0200 Subject: Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073) New snapshot --- Source/WebCore/css/CSSReflectValue.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'Source/WebCore/css/CSSReflectValue.cpp') diff --git a/Source/WebCore/css/CSSReflectValue.cpp b/Source/WebCore/css/CSSReflectValue.cpp index ede3c9a1f..7ccb76ecf 100644 --- a/Source/WebCore/css/CSSReflectValue.cpp +++ b/Source/WebCore/css/CSSReflectValue.cpp @@ -27,8 +27,8 @@ #include "CSSReflectValue.h" #include "CSSPrimitiveValue.h" -#include "MemoryInstrumentation.h" -#include "PlatformString.h" +#include "WebCoreMemoryInstrumentation.h" +#include using namespace std; @@ -36,28 +36,29 @@ namespace WebCore { String CSSReflectValue::customCssText() const { - String result; + StringBuilder result; switch (m_direction) { case ReflectionBelow: - result += "below "; + result.appendLiteral("below "); break; case ReflectionAbove: - result += "above "; + result.appendLiteral("above "); break; case ReflectionLeft: - result += "left "; + result.appendLiteral("left "); break; case ReflectionRight: - result += "right "; + result.appendLiteral("right "); break; default: break; } - result += m_offset->cssText() + " "; + result.append(m_offset->cssText()); + result.append(' '); if (m_mask) - result += m_mask->cssText(); - return result; + result.append(m_mask->cssText()); + return result.toString(); } void CSSReflectValue::addSubresourceStyleURLs(ListHashSet& urls, const StyleSheetContents* styleSheet) const @@ -68,7 +69,7 @@ void CSSReflectValue::addSubresourceStyleURLs(ListHashSet& urls, const Sty void CSSReflectValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { - MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); info.addInstrumentedMember(m_offset); info.addInstrumentedMember(m_mask); } -- cgit v1.2.1