Changeset 15480 in webkit for trunk/JavaScriptCore/API/JSObjectRef.cpp

Timestamp:

Jul 16, 2006, 9:41:01 PM (19 years ago)

Author:

ggaren

Message:

Approved by Maciej, RS by Beth.

JSObjectMakeFunction -> JSObjectMakeFunctionWithCallback
JSObjectMakeFunctionWithBody -> JSObjectMakeFunction

because the latter is more common, and more fundamental, than the former.

• API/APICast.h: (toJS):
• API/JSBase.h:
• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::getOwnPropertySlot): (KJS::JSCallbackObject::put): (KJS::JSCallbackObject::deleteProperty): (KJS::JSCallbackObject::getPropertyNames): (KJS::JSCallbackObject::staticValueGetter): (KJS::JSCallbackObject::staticFunctionGetter):
• API/JSClassRef.cpp: (OpaqueJSClass::OpaqueJSClass): (OpaqueJSClass::~OpaqueJSClass):
• API/JSClassRef.h:
• API/JSObjectRef.cpp: (JSClassCreate): (JSObjectMakeFunctionWithCallback): (JSObjectMakeFunction): (OpaqueJSPropertyNameArray::OpaqueJSPropertyNameArray): (JSObjectCopyPropertyNames):
• API/JSObjectRef.h:
• API/minidom.c: (main):
• API/testapi.c: (main):
• ChangeLog:
• JavaScriptCore.exp:

File:

• trunk/JavaScriptCore/API/JSObjectRef.cpp (modified) (5 diffs)

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -44 +44 @@
 JSClassRef JSClassCreate(JSClassDefinition* definition)
 {
-    JSClassRef jsClass = new __JSClass(definition);
+    JSClassRef jsClass = new OpaqueJSClass(definition);
     return JSClassRetain(jsClass);
 }
@@ -76 +76 @@
 }
 
-JSObjectRef JSObjectMakeFunction(JSContextRef context, JSStringRef name, JSObjectCallAsFunctionCallback callAsFunction)
+JSObjectRef JSObjectMakeFunctionWithCallback(JSContextRef context, JSStringRef name, JSObjectCallAsFunctionCallback callAsFunction)
 {
     JSLock lock;
@@ -92 +92 @@
 }
 
-JSObjectRef JSObjectMakeFunctionWithBody(JSContextRef context, JSStringRef name, unsigned parameterCount, const JSStringRef parameterNames[], JSStringRef body, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
+JSObjectRef JSObjectMakeFunction(JSContextRef context, JSStringRef name, unsigned parameterCount, const JSStringRef parameterNames[], JSStringRef body, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     JSLock lock;
@@ -298 +298 @@
 }
 
-struct __JSPropertyNameArray
-{
-    __JSPropertyNameArray() : refCount(0)
+struct OpaqueJSPropertyNameArray
+{
+    OpaqueJSPropertyNameArray() : refCount(0)
     {
     }
@@ -314 +314 @@
     ExecState* exec = toJS(context);
     
-    JSPropertyNameArrayRef propertyNames = new __JSPropertyNameArray();
+    JSPropertyNameArrayRef propertyNames = new OpaqueJSPropertyNameArray();
     jsObject->getPropertyNames(exec, propertyNames->array);