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/JavaScriptCore/runtime/JSStringBuilder.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Source/JavaScriptCore/runtime/JSStringBuilder.h') diff --git a/Source/JavaScriptCore/runtime/JSStringBuilder.h b/Source/JavaScriptCore/runtime/JSStringBuilder.h index 1a2b812f0..e7778e4fb 100644 --- a/Source/JavaScriptCore/runtime/JSStringBuilder.h +++ b/Source/JavaScriptCore/runtime/JSStringBuilder.h @@ -28,7 +28,6 @@ #include "ExceptionHelpers.h" #include "JSString.h" -#include "UStringConcatenate.h" #include namespace JSC { @@ -92,7 +91,7 @@ public: m_okay &= buffer16.tryAppend(str, len); } - void append(const UString& str) + void append(const String& str) { unsigned length = str.length(); @@ -129,12 +128,12 @@ public: buffer8.shrinkToFit(); if (!buffer8.data()) return throwOutOfMemoryError(exec); - return jsString(exec, UString::adopt(buffer8)); + return jsString(exec, String::adopt(buffer8)); } buffer16.shrinkToFit(); if (!buffer16.data()) return throwOutOfMemoryError(exec); - return jsString(exec, UString::adopt(buffer16)); + return jsString(exec, String::adopt(buffer16)); } protected: -- cgit v1.2.1