Changeset 19059 in webkit

Timestamp:

Jan 23, 2007, 2:23:09 PM (19 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:

Location:

trunk/JavaScriptCore

Files:

• API/JSClassRef.cpp (modified) (3 diffs)
• API/JSContextRef.cpp (modified) (1 diff)
• API/JSObjectRef.h (modified) (2 diffs)
• API/JSStringRef.cpp (modified) (2 diffs)
• API/JSStringRef.h (modified) (2 diffs)
• API/JSStringRefCF.cpp (added)
• API/JSStringRefCF.h (added)
• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (5 diffs)

trunk/JavaScriptCore/API/JSClassRef.cpp

@@ -38 +38 @@
 OpaqueJSClass::OpaqueJSClass(const JSClassDefinition* definition, OpaqueJSClass* protoClass) 
     : refCount(0)
+    // FIXME: <rdar://problem/4949018>
     , className(definition->className)
     , parentClass(definition->parentClass)
@@ -59 +60 @@
         staticValues = new StaticValuesTable();
         while (staticValue->name) {
+            // FIXME: <rdar://problem/4949018>
             staticValues->add(Identifier(staticValue->name).ustring().rep(), 
                               new StaticValueEntry(staticValue->getProperty, staticValue->setProperty, staticValue->attributes));
@@ -68 +70 @@
         staticFunctions = new StaticFunctionsTable();
         while (staticFunction->name) {
+            // FIXME: <rdar://problem/4949018>
             staticFunctions->add(Identifier(staticFunction->name).ustring().rep(), 
                                  new StaticFunctionEntry(staticFunction->callAsFunction, staticFunction->attributes));

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -42 +42 @@
     JSObject* globalObject;
     if (globalObjectClass)
-        // FIXME: We need to pass a real ExecState here to support an initialize callback in globalObjectClass
-        globalObject = new JSCallbackObject(0, globalObjectClass, 0, 0);
+        globalObject = new JSCallbackObject(0, globalObjectClass, 0, 0); // FIXME: <rdar://problem/4949002>
     else
         globalObject = new JSObject();

trunk/JavaScriptCore/API/JSObjectRef.h

@@ -286 +286 @@
 */
 typedef struct {
-    const char* const name; // FIXME: convert UTF8
+    const char* const name;
     JSObjectGetPropertyCallback getProperty;
     JSObjectSetPropertyCallback setProperty;
@@ -300 +300 @@
 */
 typedef struct {
-    const char* const name; // FIXME: convert UTF8
+    const char* const name;
     JSObjectCallAsFunctionCallback callAsFunction;
     JSPropertyAttributes attributes;

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__

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
 }

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-01-23  Geoffrey Garen  <[email protected]>
+
+        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:
+
 2007-01-18  Sanjay Madhav  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -54 +54 @@
                 1440FCE30A51E46B0005F061 /* JSClassRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 1440FCE10A51E46B0005F061 /* JSClassRef.h */; };
                 1440FCE40A51E46B0005F061 /* JSClassRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1440FCE20A51E46B0005F061 /* JSClassRef.cpp */; };
+                146AAB2B0B66A84900E55F16 /* JSStringRefCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 146AAB2A0B66A84900E55F16 /* JSStringRefCF.h */; };
+                146AAB380B66A94400E55F16 /* JSStringRefCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 146AAB370B66A94400E55F16 /* JSStringRefCF.cpp */; };
                 14760864099C633800437128 /* JSImmediate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14760863099C633800437128 /* JSImmediate.cpp */; };
                 1482B6EB0A4300B300517CFC /* JSValueRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 1482B6EA0A4300B300517CFC /* JSValueRef.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -437 +439 @@
                 1440FCE10A51E46B0005F061 /* JSClassRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSClassRef.h; sourceTree = "<group>"; };
                 1440FCE20A51E46B0005F061 /* JSClassRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSClassRef.cpp; sourceTree = "<group>"; };
+                146AAB2A0B66A84900E55F16 /* JSStringRefCF.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSStringRefCF.h; sourceTree = "<group>"; };
+                146AAB370B66A94400E55F16 /* JSStringRefCF.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSStringRefCF.cpp; sourceTree = "<group>"; };
                 14760863099C633800437128 /* JSImmediate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSImmediate.cpp; sourceTree = "<group>"; };
                 1482B6EA0A4300B300517CFC /* JSValueRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSValueRef.h; sourceTree = "<group>"; };
@@ -785 +789 @@
                                 1482B74C0A43032800517CFC /* JSStringRef.cpp */,
                                 1482B74B0A43032800517CFC /* JSStringRef.h */,
+                                146AAB2A0B66A84900E55F16 /* JSStringRefCF.h */,
+                                146AAB370B66A94400E55F16 /* JSStringRefCF.cpp */,
                                 14BD5A2B0A3E91F600BAF59C /* JSValueRef.cpp */,
                                 1482B6EA0A4300B300517CFC /* JSValueRef.h */,
@@ -1214 +1220 @@
                                 D212022B0AD4310D00ED79B6 /* DateMath.h in Headers */,
                                 E11D51760B2E798D0056C188 /* StringExtras.h in Headers */,
+                                146AAB2B0B66A84900E55F16 /* JSStringRefCF.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1511 +1518 @@
                                 65C7A1730A8EAACB00FA37EA /* JSWrapperObject.cpp in Sources */,
                                 D212022A0AD4310D00ED79B6 /* DateMath.cpp in Sources */,
+                                146AAB380B66A94400E55F16 /* JSStringRefCF.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;