Changeset 15307 in webkit for trunk/JavaScriptCore/API/minidom.c

Timestamp:

Jul 10, 2006, 10:41:32 AM (19 years ago)

Author:

ggaren

Message:

Approved by Maciej, Darin.

Renamed JSStringBufferRef to JSInternalStringRef. "Internal string" means the
JavaScript engine's internal string representation, which is the most
low-level and efficient representation to use when interfacing with JavaScript.

• API/APICast.h: (toJS): (toRef):
• API/JSBase.h:
• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::getOwnPropertySlot): (KJS::JSCallbackObject::put): (KJS::JSCallbackObject::deleteProperty): (KJS::JSCallbackObject::staticValueGetter): (KJS::JSCallbackObject::callbackGetter):
• API/JSContextRef.cpp: (JSEvaluate): (JSCheckSyntax):
• API/JSContextRef.h:
• API/JSInternalStringRef.cpp: Added. (JSStringMake): (JSInternalStringCreate): (JSInternalStringCreateUTF8): (JSInternalStringRetain): (JSInternalStringRelease): (JSValueCopyStringValue): (JSInternalStringGetLength): (JSInternalStringGetCharactersPtr): (JSInternalStringGetCharacters): (JSInternalStringGetMaxLengthUTF8): (JSInternalStringGetCharactersUTF8): (JSInternalStringIsEqual): (JSInternalStringIsEqualUTF8): (JSInternalStringCreateCF): (CFStringCreateWithJSInternalString):
• API/JSInternalStringRef.h: Added.
• API/JSNode.c: (JSNodePrototype_appendChild): (JSNode_getNodeType): (JSNode_getChildNodes): (JSNode_getFirstChild):
• API/JSNodeList.c: (JSNodeList_length): (JSNodeList_getProperty):
• API/JSObjectRef.cpp: (JSFunctionMakeWithBody): (JSObjectGetDescription): (JSObjectHasProperty): (JSObjectGetProperty): (JSObjectSetProperty): (JSObjectDeleteProperty): (JSPropertyEnumeratorGetNext): (JSPropertyListAdd):
• API/JSObjectRef.h:
• API/JSStringBufferRef.cpp: Removed.
• API/JSStringBufferRef.h: Removed.
• API/JSValueRef.h:
• API/JavaScriptCore.h:
• API/minidom.c: (main): (print):
• API/testapi.c: (assertEqualsAsUTF8String): (assertEqualsAsCharactersPtr): (assertEqualsAsCharacters): (MyObject_hasProperty): (MyObject_getProperty): (MyObject_setProperty): (MyObject_deleteProperty): (MyObject_getPropertyList): (print_callAsFunction): (myConstructor_callAsConstructor): (main):
• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:

File:

• trunk/JavaScriptCore/API/minidom.c (modified) (3 diffs)

trunk/JavaScriptCore/API/minidom.c

@@ -40 +40 @@
     JSObjectRef globalObject = JSContextGetGlobalObject(context);
     
-    JSStringBufferRef printBuf = JSStringBufferCreateUTF8("print");
+    JSInternalStringRef printBuf = JSInternalStringCreateUTF8("print");
     JSObjectSetProperty(context, globalObject, printBuf, JSFunctionMake(context, print), kJSPropertyAttributeNone);
-    JSStringBufferRelease(printBuf);
+    JSInternalStringRelease(printBuf);
     
-    JSStringBufferRef nodeBuf = JSStringBufferCreateUTF8("Node");
+    JSInternalStringRef nodeBuf = JSInternalStringCreateUTF8("Node");
     JSObjectSetProperty(context, globalObject, nodeBuf, JSConstructorMake(context, JSNode_construct), kJSPropertyAttributeNone);
-    JSStringBufferRelease(nodeBuf);
+    JSInternalStringRelease(nodeBuf);
     
     char* script = createStringWithContentsOfFile("minidom.js");
-    JSStringBufferRef scriptBuf = JSStringBufferCreateUTF8(script);
+    JSInternalStringRef scriptBuf = JSInternalStringCreateUTF8(script);
     JSValueRef exception;
     JSValueRef result = JSEvaluate(context, scriptBuf, NULL, NULL, 0, &exception);
@@ -56 +56 @@
     else {
         printf("FAIL: Test script threw exception:\n");
-        JSStringBufferRef exceptionBuf = JSValueCopyStringValue(context, exception);
-        CFStringRef exceptionCF = CFStringCreateWithJSStringBuffer(kCFAllocatorDefault, exceptionBuf);
+        JSInternalStringRef exceptionBuf = JSValueCopyStringValue(context, exception);
+        CFStringRef exceptionCF = CFStringCreateWithJSInternalString(kCFAllocatorDefault, exceptionBuf);
         CFShow(exceptionCF);
         CFRelease(exceptionCF);
-        JSStringBufferRelease(exceptionBuf);
+        JSInternalStringRelease(exceptionBuf);
     }
-    JSStringBufferRelease(scriptBuf);
+    JSInternalStringRelease(scriptBuf);
     free(script);
 
@@ -82 +82 @@
 {
     if (argc > 0) {
-        JSStringBufferRef stringBuf = JSValueCopyStringValue(context, argv[0]);
-        size_t numChars = JSStringBufferGetMaxLengthUTF8(stringBuf);
+        JSInternalStringRef stringBuf = JSValueCopyStringValue(context, argv[0]);
+        size_t numChars = JSInternalStringGetMaxLengthUTF8(stringBuf);
         char string[numChars];
-        JSStringBufferGetCharactersUTF8(stringBuf, string, numChars);
+        JSInternalStringGetCharactersUTF8(stringBuf, string, numChars);
         printf("%s\n", string);
     }