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

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.h (modified) (2 diffs)

trunk/JavaScriptCore/API/JSStringRef.h

@@ -35 +35 @@
 #ifdef __cplusplus
 extern "C" {
+#endif
+
+#if defined(__APPLE__)
+#include "JSStringRefCF.h"
 #endif
 
@@ -137 +141 @@
 bool JSStringIsEqualToUTF8CString(JSStringRef a, const char* b);
 
-#if defined(__APPLE__)
-#include <CoreFoundation/CoreFoundation.h>
-// CFString convenience methods
-/*!
-@function
-@abstract         Creates a JavaScript string from a CFString.
-@discussion       This function is optimized to take advantage of cases when 
- CFStringGetCharactersPtr returns a valid pointer.
-@param string     The CFString to copy into the new JSString.
-@result           A JSString containing string. Ownership follows the Create Rule.
-*/
-JSStringRef JSStringCreateWithCFString(CFStringRef string);
-/*!
-@function
-@abstract         Creates a CFString from a JavaScript string.
-@param alloc      The alloc parameter to pass to CFStringCreate.
-@param string     The JSString to copy into the new CFString.
-@result           A CFString containing string. Ownership follows the Create Rule.
-*/
-CFStringRef JSStringCopyCFString(CFAllocatorRef alloc, JSStringRef string);
-#endif // __APPLE__
-    
 #ifdef __cplusplus
 }