Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)

New snapshot

1 files changed, 8 insertions, 6 deletions

diff --git a/Source/WebCore/css/CSSFunctionValue.cpp b/Source/WebCore/css/CSSFunctionValue.cpp
index 9f8f24f30..46a98f9b0 100644
--- a/Source/WebCore/css/CSSFunctionValue.cpp
+++ b/Source/WebCore/css/CSSFunctionValue.cpp
@@ -28,8 +28,9 @@
 
 #include "CSSParserValues.h"
 #include "CSSValueList.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/PassOwnPtr.h>
+#include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
 
@@ -43,16 +44,17 @@ CSSFunctionValue::CSSFunctionValue(CSSParserFunction* function)
 
 String CSSFunctionValue::customCssText() const
 {
-    String result = m_name; // Includes the '('
+    StringBuilder result;
+    result.append(m_name); // Includes the '('
     if (m_args)
-        result += m_args->cssText();
-    result += ")";
-    return result;
+        result.append(m_args->cssText());
+    result.append(')');
+    return result.toString();
 }
 
 void CSSFunctionValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
-    MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS);
+    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
     info.addInstrumentedMember(m_name);
     info.addInstrumentedMember(m_args);
 }