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

Timestamp:

Jul 5, 2006, 12:10:49 PM (19 years ago)

Author:

ggaren

Message:

RS by Beth.

Renamed JSCharBufferRef, which was universally unpopular, to JSStringBufferRef,
which, hopefully, will be less unpopular.

• 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/JSCharBufferRef.cpp: Removed.
• API/JSCharBufferRef.h: Removed.
• API/JSContextRef.cpp: (JSEvaluate): (JSCheckSyntax):
• API/JSContextRef.h:
• 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: Added. (JSStringMake): (JSStringBufferCreate): (JSStringBufferCreateUTF8): (JSStringBufferRetain): (JSStringBufferRelease): (JSValueCopyStringValue): (JSStringBufferGetLength): (JSStringBufferGetCharactersPtr): (JSStringBufferGetCharacters): (JSStringBufferGetMaxLengthUTF8): (JSStringBufferGetCharactersUTF8): (JSStringBufferIsEqual): (JSStringBufferIsEqualUTF8): (JSStringBufferCreateWithCFString): (CFStringCreateWithJSStringBuffer):
• API/JSStringBufferRef.h: Added.
• 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);
     
-    JSCharBufferRef printBuf = JSCharBufferCreateUTF8("print");
+    JSStringBufferRef printBuf = JSStringBufferCreateUTF8("print");
     JSObjectSetProperty(context, globalObject, printBuf, JSFunctionMake(context, print), kJSPropertyAttributeNone);
-    JSCharBufferRelease(printBuf);
+    JSStringBufferRelease(printBuf);
     
-    JSCharBufferRef nodeBuf = JSCharBufferCreateUTF8("Node");
+    JSStringBufferRef nodeBuf = JSStringBufferCreateUTF8("Node");
     JSObjectSetProperty(context, globalObject, nodeBuf, JSConstructorMake(context, JSNode_construct), kJSPropertyAttributeNone);
-    JSCharBufferRelease(nodeBuf);
+    JSStringBufferRelease(nodeBuf);
     
     char* script = createStringWithContentsOfFile("minidom.js");
-    JSCharBufferRef scriptBuf = JSCharBufferCreateUTF8(script);
+    JSStringBufferRef scriptBuf = JSStringBufferCreateUTF8(script);
     JSValueRef exception;
     JSValueRef result = JSEvaluate(context, scriptBuf, NULL, NULL, 0, &exception);
@@ -56 +56 @@
     else {
         printf("FAIL: Test script threw exception:\n");
-        JSCharBufferRef exceptionBuf = JSValueCopyStringValue(context, exception);
-        CFStringRef exceptionCF = CFStringCreateWithJSCharBuffer(kCFAllocatorDefault, exceptionBuf);
+        JSStringBufferRef exceptionBuf = JSValueCopyStringValue(context, exception);
+        CFStringRef exceptionCF = CFStringCreateWithJSStringBuffer(kCFAllocatorDefault, exceptionBuf);
         CFShow(exceptionCF);
         CFRelease(exceptionCF);
-        JSCharBufferRelease(exceptionBuf);
+        JSStringBufferRelease(exceptionBuf);
     }
-    JSCharBufferRelease(scriptBuf);
+    JSStringBufferRelease(scriptBuf);
     free(script);
 
@@ -82 +82 @@
 {
     if (argc > 0) {
-        JSCharBufferRef stringBuf = JSValueCopyStringValue(context, argv[0]);
-        size_t numChars = JSCharBufferGetMaxLengthUTF8(stringBuf);
+        JSStringBufferRef stringBuf = JSValueCopyStringValue(context, argv[0]);
+        size_t numChars = JSStringBufferGetMaxLengthUTF8(stringBuf);
         char string[numChars];
-        JSCharBufferGetCharactersUTF8(stringBuf, string, numChars);
+        JSStringBufferGetCharactersUTF8(stringBuf, string, numChars);
         printf("%s\n", string);
     }