Changeset 33374 in webkit for trunk/JavaScriptCore/API

Timestamp:

May 13, 2008, 2:46:47 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoffrey Garen.

<rdar://problem/4949018> JavaScriptCore API claims to work with UTF8 strings, but only works
with ASCII strings

• kjs/ustring.h:
• kjs/ustring.cpp: (KJS::UString::Rep::createFromUTF8): Added. Implementation adapted from JSStringCreateWithUTF8CString().

• API/JSStringRef.cpp: (JSStringCreateWithUTF8CString):
• API/JSClassRef.cpp: (OpaqueJSClass::OpaqueJSClass): Use UString::Rep::createFromUTF8().

Location:

trunk/JavaScriptCore/API

Files:

• JSClassRef.cpp (modified) (3 diffs)
• JSStringRef.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSClassRef.cpp

@@ -40 +40 @@
 
 OpaqueJSClass::OpaqueJSClass(const JSClassDefinition* definition, OpaqueJSClass* protoClass) 
-    // FIXME: <rdar://problem/4949018>
-    : className(definition->className)
+    : className(UString::Rep::createFromUTF8(definition->className))
     , parentClass(definition->parentClass)
     , prototypeClass(0)
@@ -62 +61 @@
         staticValues = new StaticValuesTable();
         while (staticValue->name) {
-            // FIXME: <rdar://problem/4949018>
-            staticValues->add(Identifier(staticValue->name).ustring().rep(), 
+            staticValues->add(Identifier(UString::Rep::createFromUTF8(staticValue->name).get()).ustring().rep(), 
                               new StaticValueEntry(staticValue->getProperty, staticValue->setProperty, staticValue->attributes));
             ++staticValue;
@@ -72 +70 @@
         staticFunctions = new StaticFunctionsTable();
         while (staticFunction->name) {
-            // FIXME: <rdar://problem/4949018>
-            staticFunctions->add(Identifier(staticFunction->name).ustring().rep(), 
+            staticFunctions->add(Identifier(UString::Rep::createFromUTF8(staticFunction->name).get()).ustring().rep(), 
                                  new StaticFunctionEntry(staticFunction->callAsFunction, staticFunction->attributes));
             ++staticFunction;

trunk/JavaScriptCore/API/JSStringRef.cpp

@@ -52 +52 @@
     JSLock lock;
 
-    size_t length = strlen(string);
-    Vector<UChar, 1024> buffer(length);
-    UChar* p = buffer.data();
-    if (conversionOK != convertUTF8ToUTF16(&string, string + length, &p, p + length))
+    RefPtr<UString::Rep> result = UString::Rep::createFromUTF8(string);
+    if (result.get() == &UString::Rep::null)
         return 0;
 
-    return toRef(UString(buffer.data(), p - buffer.data()).rep()->ref());
+    return toRef(result.release().releaseRef());
 }