Changeset 19059 in webkit for trunk/JavaScriptCore/API/JSStringRef.cpp

Timestamp:

Jan 23, 2007, 2:23:09 PM (18 years ago)

Author:

ggaren

Message:

Reviewed by Maciej Stachowiak.

Fixed <rdar://problem/4885131> Move CFString function declarations from
JSStringRef.h to JSStringRefCF.h

Also removed remaining API FIXMEs and changed them into Radars.

• API/JSClassRef.cpp: (OpaqueJSClass::OpaqueJSClass): Added Radar numbers for UTF8 conversion.

• API/JSContextRef.cpp: (JSGlobalContextCreate): Replaced FIXME for NULL JSContextRef with Radar number.

• API/JSObjectRef.h: Removed FIXME, which is unprofessional in a public header.

• API/JSStringRef.cpp: Moved CF related implementations to JSStringRefCF.cpp. (JSStringCreateWithUTF8CString): Replaced FIXME with Radar number.
• API/JSStringRef.h: Moved CF related declarations to JSStringRefCF.h. Added #include of JSStringRefCF.h as a stopgap until clients start #including it as needed by themselves.

• API/JSStringRefCF.cpp: Added. (JSStringCreateWithCFString): (JSStringCopyCFString): Replaced JSChar cast with UniChar cast, which is more appropriate for a CF call.
• API/JSStringRefCF.h: Added.
• JavaScriptCore.xcodeproj/project.pbxproj:

File:

• trunk/JavaScriptCore/API/JSStringRef.cpp (modified) (2 diffs)

trunk/JavaScriptCore/API/JSStringRef.cpp

@@ -47 +47 @@
 {
     JSLock lock;
-    // FIXME: Only works with ASCII
-    // Use decodeUTF8Sequence or http://www.unicode.org/Public/PROGRAMS/CVTUTF/ instead
+    // FIXME: <rdar://problem/4949018>
     return toRef(UString(string).rep()->ref());
 }
@@ -112 +111 @@
     return result;
 }
-
-#if defined(__APPLE__)
-JSStringRef JSStringCreateWithCFString(CFStringRef string)
-{
-    JSLock lock;
-    CFIndex length = CFStringGetLength(string);
-    
-    // Optimized path for when CFString backing store is a UTF16 buffer
-    if (const UniChar* buffer = CFStringGetCharactersPtr(string)) {
-        UString::Rep* rep = UString(reinterpret_cast<const UChar*>(buffer), length).rep()->ref();
-        return toRef(rep);
-    }
-
-    UniChar* buffer = static_cast<UniChar*>(fastMalloc(sizeof(UniChar) * length));
-    CFStringGetCharacters(string, CFRangeMake(0, length), buffer);
-    UString::Rep* rep = UString(reinterpret_cast<UChar*>(buffer), length, false).rep()->ref();
-    return toRef(rep);
-}
-
-CFStringRef JSStringCopyCFString(CFAllocatorRef alloc, JSStringRef string)
-{
-    UString::Rep* rep = toJS(string);
-    return CFStringCreateWithCharacters(alloc, reinterpret_cast<const JSChar*>(rep->data()), rep->size());
-}
-
-#endif // __APPLE__