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/CSSCrossfadeValue.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'Source/WebCore/css/CSSCrossfadeValue.cpp') diff --git a/Source/WebCore/css/CSSCrossfadeValue.cpp b/Source/WebCore/css/CSSCrossfadeValue.cpp index 5ed7da18d..e347ebd09 100644 --- a/Source/WebCore/css/CSSCrossfadeValue.cpp +++ b/Source/WebCore/css/CSSCrossfadeValue.cpp @@ -31,10 +31,11 @@ #include "CachedResourceLoader.h" #include "CrossfadeGeneratedImage.h" #include "ImageBuffer.h" -#include "MemoryInstrumentation.h" #include "RenderObject.h" #include "StyleCachedImage.h" #include "StyleGeneratedImage.h" +#include "WebCoreMemoryInstrumentation.h" +#include namespace WebCore { @@ -85,12 +86,15 @@ CSSCrossfadeValue::~CSSCrossfadeValue() String CSSCrossfadeValue::customCssText() const { - String result = "-webkit-cross-fade("; - result += m_fromValue->cssText() + ", "; - result += m_toValue->cssText() + ", "; - result += m_percentageValue->cssText(); - result += ")"; - return result; + StringBuilder result; + result.appendLiteral("-webkit-cross-fade("); + result.append(m_fromValue->cssText()); + result.appendLiteral(", "); + result.append(m_toValue->cssText()); + result.appendLiteral(", "); + result.append(m_percentageValue->cssText()); + result.append(')'); + return result.toString(); } IntSize CSSCrossfadeValue::fixedSize(const RenderObject* renderer) @@ -137,7 +141,7 @@ void CSSCrossfadeValue::loadSubimages(CachedResourceLoader* cachedResourceLoader void CSSCrossfadeValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { - MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); CSSImageGeneratorValue::reportBaseClassMemoryUsage(memoryObjectInfo); info.addInstrumentedMember(m_fromValue); info.addInstrumentedMember(m_toValue); -- cgit v1.2.1