Changeset 225150 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

Timestamp:

Nov 26, 2017, 5:22:43 PM (8 years ago)

Author:

Yusuke Suzuki

Message:

[JSC] Remove JSStringBuilder
​https://bugs.webkit.org/show_bug.cgi?id=180016

Reviewed by Saam Barati.

JSStringBuilder is replaced with WTF::StringBuilder.
This patch removes remaning uses and drop JSStringBuilder.

• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/ArrayPrototype.cpp:
• runtime/AsyncFunctionPrototype.cpp:
• runtime/AsyncGeneratorFunctionPrototype.cpp:
• runtime/ErrorPrototype.cpp:
• runtime/FunctionPrototype.cpp:
• runtime/GeneratorFunctionPrototype.cpp:
• runtime/JSGlobalObjectFunctions.cpp:

(JSC::decode):
(JSC::globalFuncEscape):

• runtime/JSStringBuilder.h: Removed.
• runtime/JSStringInlines.h:

(JSC::jsMakeNontrivialString):

• runtime/RegExpPrototype.cpp:
• runtime/StringPrototype.cpp:

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -40 +40 @@
 #include "JSPromiseDeferred.h"
 #include "JSString.h"
-#include "JSStringBuilder.h"
 #include "Lexer.h"
 #include "LiteralParser.h"
@@ -173 +172 @@
     auto scope = DECLARE_THROW_SCOPE(vm);
 
-    JSStringBuilder builder;
+    StringBuilder builder;
     int k = 0;
     UChar u = 0;
@@ -233 +232 @@
     }
     scope.release();
-    return builder.build(exec);
+    return jsString(&vm, builder.toString());
 }
 
@@ -594 +593 @@
 
     return JSValue::encode(toStringView(exec, exec->argument(0), [&] (StringView view) {
-        JSStringBuilder builder;
+        StringBuilder builder;
         if (view.is8Bit()) {
             const LChar* c = view.characters8();
@@ -606 +605 @@
                 }
             }
-
-            return builder.build(exec);
+            return jsString(exec, builder.toString());
         }
 
@@ -626 +624 @@
         }
 
-        return builder.build(exec);
+        return jsString(exec, builder.toString());
     }));
 }