diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/JavaScriptCore/runtime/Operations.h | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/JavaScriptCore/runtime/Operations.h')
| -rw-r--r-- | Source/JavaScriptCore/runtime/Operations.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/JavaScriptCore/runtime/Operations.h b/Source/JavaScriptCore/runtime/Operations.h index 945283899..b2081f3dd 100644 --- a/Source/JavaScriptCore/runtime/Operations.h +++ b/Source/JavaScriptCore/runtime/Operations.h @@ -47,7 +47,7 @@ namespace JSC { if ((length1 + length2) < length1) return throwOutOfMemoryError(exec); - return JSString::create(globalData, s1, s2); + return JSRopeString::create(globalData, s1, s2); } ALWAYS_INLINE JSValue jsString(ExecState* exec, const UString& u1, const UString& u2, const UString& u3) @@ -69,13 +69,13 @@ namespace JSC { if ((length1 + length2 + length3) < length3) return throwOutOfMemoryError(exec); - return JSString::create(exec->globalData(), jsString(globalData, u1), jsString(globalData, u2), jsString(globalData, u3)); + return JSRopeString::create(exec->globalData(), jsString(globalData, u1), jsString(globalData, u2), jsString(globalData, u3)); } ALWAYS_INLINE JSValue jsString(ExecState* exec, Register* strings, unsigned count) { JSGlobalData* globalData = &exec->globalData(); - JSString::RopeBuilder ropeBuilder(*globalData); + JSRopeString::RopeBuilder ropeBuilder(*globalData); unsigned oldLength = 0; @@ -93,7 +93,7 @@ namespace JSC { ALWAYS_INLINE JSValue jsStringFromArguments(ExecState* exec, JSValue thisValue) { JSGlobalData* globalData = &exec->globalData(); - JSString::RopeBuilder ropeBuilder(*globalData); + JSRopeString::RopeBuilder ropeBuilder(*globalData); ropeBuilder.append(thisValue.toString(exec)); unsigned oldLength = 0; |