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/CSSCanvasValue.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'Source/WebCore/css/CSSCanvasValue.cpp') diff --git a/Source/WebCore/css/CSSCanvasValue.cpp b/Source/WebCore/css/CSSCanvasValue.cpp index 63777bb4d..8ecc80c08 100644 --- a/Source/WebCore/css/CSSCanvasValue.cpp +++ b/Source/WebCore/css/CSSCanvasValue.cpp @@ -27,8 +27,9 @@ #include "CSSCanvasValue.h" #include "ImageBuffer.h" -#include "MemoryInstrumentation.h" #include "RenderObject.h" +#include "WebCoreMemoryInstrumentation.h" +#include namespace WebCore { @@ -40,9 +41,11 @@ CSSCanvasValue::~CSSCanvasValue() String CSSCanvasValue::customCssText() const { - String result = "-webkit-canvas("; - result += m_name + ")"; - return result; + StringBuilder result; + result.appendLiteral("-webkit-canvas("); + result.append(m_name); + result.append(')'); + return result.toString(); } void CSSCanvasValue::canvasChanged(HTMLCanvasElement*, const FloatRect& changedRect) @@ -95,7 +98,7 @@ PassRefPtr CSSCanvasValue::image(RenderObject* renderer, const IntSize& / void CSSCanvasValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { - MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); CSSImageGeneratorValue::reportBaseClassMemoryUsage(memoryObjectInfo); info.addInstrumentedMember(m_name); info.addInstrumentedMember(m_element); -- cgit v1.2.1