Changeset 54545 in webkit for trunk/JavaScriptCore/runtime/UString.cpp

Timestamp:

Feb 9, 2010, 3:55:39 AM (15 years ago)

Author:

[email protected]

Message:

Three small string fixes:
(1) StringBuilder::release should CRASH if the buffer allocation failed.
(2) Remove weird, dead code from JSString::tryGetValue, replace with an ASSERT.
(3) Move UString::createFromUTF8 out to the API, as tryCreateStringFromUTF8.

This is only used from the API, and (now) unlike other UString::create
methods may return UString::null() to indicate failure cases. Better
handle these in the API.

Reviewed by Oliver Hunt.

• API/JSClassRef.cpp:

(tryCreateStringFromUTF8):
(OpaqueJSClass::OpaqueJSClass):
(OpaqueJSClassContextData::OpaqueJSClassContextData):

• runtime/JSString.h:

(JSC::Fiber::tryGetValue):

• runtime/StringBuilder.h:

(JSC::StringBuilder::release):

• runtime/UString.cpp:

(JSC::UString::UString):
(JSC::UString::from):
(JSC::UString::find):

• runtime/UString.h:

File:

• trunk/JavaScriptCore/runtime/UString.cpp (modified) (8 diffs)

trunk/JavaScriptCore/runtime/UString.cpp

@@ -54 +54 @@
 
 namespace JSC {
- 
+
 extern const double NaN;
 extern const double Inf;
@@ -147 +147 @@
 }
 
-// These static strings are immutable, except for rc, whose initial value is chosen to 
+// These static strings are immutable, except for rc, whose initial value is chosen to
 // reduce the possibility of it becoming zero due to ref/deref not being thread-safe.
 static UChar sharedEmptyChar;
@@ -175 +175 @@
 UString::UString(const UChar* c, int length)
 {
-    if (length == 0) 
+    if (length == 0)
         m_rep = &Rep::empty();
     else
@@ -181 +181 @@
 }
 
-UString UString::createFromUTF8(const char* string)
-{
-    if (!string)
-        return null();
-
-    size_t length = strlen(string);
-    Vector<UChar, 1024> buffer(length);
-    UChar* p = buffer.data();
-    if (conversionOK != convertUTF8ToUTF16(&string, string + length, &p, p + length))
-        return null();
-
-    return UString(buffer.data(), p - buffer.data());
-}
-
 UString UString::from(int i)
 {
@@ -200 +186 @@
     UChar* end = buf + sizeof(buf) / sizeof(UChar);
     UChar* p = end;
-  
+
     if (i == 0)
         *--p = '0';
@@ -262 +248 @@
     UChar* end = buf + sizeof(buf) / sizeof(UChar);
     UChar* p = end;
-    
+
     if (u == 0)
         *--p = '0';
@@ -271 +257 @@
         }
     }
-    
+
     return UString(p, static_cast<int>(end - p));
 }
@@ -598 +584 @@
             return static_cast<int>(c - data());
     }
-    
+
     return -1;
 }