Changeset 54513 in webkit for trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

Timestamp:

Feb 8, 2010, 3:04:34 PM (15 years ago)

Author:

[email protected]

Message:

Switch some more StringBuilder/jsNontrivialString code to use
JSStringBuilder/jsMakeNontrivialString - these methods will
throw an exception if we hit out-of-memory, rather than just
CRASHing.

Reviewed by Geoff Garen.

• runtime/FunctionPrototype.cpp:

(JSC::functionProtoFuncToString):

• runtime/JSGlobalObjectFunctions.cpp:

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

File:

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

trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -31 +31 @@
 #include "JSGlobalObject.h"
 #include "JSString.h"
+#include "JSStringBuilder.h"
 #include "Lexer.h"
 #include "LiteralParser.h"
 #include "Nodes.h"
 #include "Parser.h"
-#include "StringBuilder.h"
 #include "StringExtras.h"
 #include "dtoa.h"
@@ -58 +58 @@
         return throwError(exec, URIError, "String contained an illegal UTF-16 sequence.");
 
-    StringBuilder builder;
+    JSStringBuilder builder;
     const char* p = cstr.c_str();
     for (size_t k = 0; k < cstr.size(); k++, p++) {
@@ -70 +70 @@
         }
     }
-    return jsString(exec, builder.release());
+    return builder.releaseJSString(exec);
 }
 
 static JSValue decode(ExecState* exec, const ArgList& args, const char* doNotUnescape, bool strict)
 {
-    StringBuilder builder;
+    JSStringBuilder builder;
     UString str = args.at(0).toString(exec);
     int k = 0;
@@ -136 +136 @@
         builder.append(c);
     }
-    return jsString(exec, builder.release());
+    return builder.releaseJSString(exec);
 }
 
@@ -379 +379 @@
         "*+-./@_";
 
-    StringBuilder builder;
-    UString s;
+    JSStringBuilder builder;
     UString str = args.at(0).toString(exec);
     const UChar* c = str.data();
@@ -388 +387 @@
             char tmp[7];
             sprintf(tmp, "%%u%04X", u);
-            s = UString(tmp);
+            builder.append((const char*)tmp);
         } else if (u != 0 && strchr(do_not_escape, static_cast<char>(u)))
-            s = UString(c, 1);
+            builder.append(c, 1);
         else {
             char tmp[4];
             sprintf(tmp, "%%%02X", u);
-            s = UString(tmp);
-        }
-        builder.append(s);
-    }
-
-    return jsString(exec, builder.release());
+            builder.append((const char*)tmp);
+        }
+    }
+
+    return builder.releaseJSString(exec);
 }