Changeset 15481 in webkit for trunk/JavaScriptCore/API/JSCallbackObject.cpp

Timestamp:

Jul 17, 2006, 1:14:39 AM (19 years ago)

Author:

mjs

Message:

Reviewed by Geoff.

• add a JSContextRef parameter to all JSValueRef, JSObjectRef, and JSContextRef operations; except JSObject{Get,Set}PrivateData which can be assumed to be simple pure accessors.

Also renamed the parameter "context" to "ctx" because it makes the code read better with this pervasive
but usually uninteresting parameter.

• API/JSBase.cpp: (JSEvaluateScript): (JSCheckScriptSyntax): (JSGarbageCollect):
• API/JSBase.h:
• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::JSCallbackObject): (KJS::JSCallbackObject::init): (KJS::JSCallbackObject::getOwnPropertySlot): (KJS::JSCallbackObject::put): (KJS::JSCallbackObject::deleteProperty): (KJS::JSCallbackObject::toNumber): (KJS::JSCallbackObject::toString):
• API/JSContextRef.cpp: (JSGlobalContextCreate): (JSGlobalContextRetain): (JSGlobalContextRelease): (JSContextGetGlobalObject):
• API/JSContextRef.h:
• API/JSNode.c: (JSNodePrototype_appendChild): (JSNodePrototype_removeChild): (JSNodePrototype_replaceChild): (JSNode_getNodeType): (JSNode_getFirstChild): (JSNode_prototype):
• API/JSNodeList.c: (JSNodeListPrototype_item): (JSNodeList_length): (JSNodeList_getProperty): (JSNodeList_prototype):
• API/JSObjectRef.cpp: (JSObjectMake): (JSObjectMakeFunctionWithCallback): (JSObjectMakeConstructor): (JSObjectMakeFunction): (JSObjectGetPrototype): (JSObjectSetPrototype): (JSObjectHasProperty): (JSObjectGetProperty): (JSObjectSetProperty): (JSObjectGetPropertyAtIndex): (JSObjectSetPropertyAtIndex): (JSObjectDeleteProperty): (JSObjectIsFunction): (JSObjectCallAsFunction): (JSObjectIsConstructor): (JSObjectCallAsConstructor): (JSObjectCopyPropertyNames):
• API/JSObjectRef.h:
• API/JSStringRef.cpp:
• API/JSValueRef.cpp: (JSValueGetType): (JSValueIsUndefined): (JSValueIsNull): (JSValueIsBoolean): (JSValueIsNumber): (JSValueIsString): (JSValueIsObject): (JSValueIsObjectOfClass): (JSValueIsEqual): (JSValueIsStrictEqual): (JSValueIsInstanceOfConstructor): (JSValueMakeUndefined): (JSValueMakeNull): (JSValueMakeBoolean): (JSValueMakeNumber): (JSValueMakeString): (JSValueToBoolean): (JSValueToNumber): (JSValueToStringCopy): (JSValueToObject): (JSValueProtect): (JSValueUnprotect):
• API/JSValueRef.h:
• API/minidom.c: (print):
• API/testapi.c: (MyObject_getProperty): (MyObject_deleteProperty): (MyObject_callAsFunction): (MyObject_callAsConstructor): (MyObject_convertToType): (print_callAsFunction): (main):

File:

• trunk/JavaScriptCore/API/JSCallbackObject.cpp (modified) (11 diffs)

trunk/JavaScriptCore/API/JSCallbackObject.cpp

@@ -38 +38 @@
 const ClassInfo JSCallbackObject::info = { "CallbackObject", 0, 0, 0 };
 
-JSCallbackObject::JSCallbackObject(JSContextRef context, JSClassRef jsClass)
+JSCallbackObject::JSCallbackObject(JSContextRef ctx, JSClassRef jsClass)
     : JSObject()
 {
-    init(context, jsClass);
-}
-
-JSCallbackObject::JSCallbackObject(JSContextRef context, JSClassRef jsClass, JSValue* prototype)
+    init(ctx, jsClass);
+}
+
+JSCallbackObject::JSCallbackObject(JSContextRef ctx, JSClassRef jsClass, JSValue* prototype)
     : JSObject(prototype)
 {
-    init(context, jsClass);
-}
-
-void JSCallbackObject::init(JSContextRef context, JSClassRef jsClass)
-{
-    ExecState* exec = toJS(context);
+    init(ctx, jsClass);
+}
+
+void JSCallbackObject::init(JSContextRef ctx, JSClassRef jsClass)
+{
+    ExecState* exec = toJS(ctx);
     
     m_privateData = 0;
@@ -61 +61 @@
     do {
         if (JSObjectInitializeCallback initialize = jsClass->initialize)
-            initialize(context, thisRef, toRef(exec->exceptionSlot()));
+            initialize(ctx, thisRef, toRef(exec->exceptionSlot()));
     } while ((jsClass = jsClass->parentClass));
 }
@@ -86 +86 @@
 bool JSCallbackObject::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
 {
-    JSContextRef context = toRef(exec);
+    JSContextRef ctx = toRef(exec);
     JSObjectRef thisRef = toRef(this);
     JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
@@ -93 +93 @@
         // optional optimization to bypass getProperty in cases when we only need to know if the property exists
         if (JSObjectHasPropertyCallback hasProperty = jsClass->hasProperty) {
-            if (hasProperty(context, thisRef, propertyNameRef)) {
+            if (hasProperty(ctx, thisRef, propertyNameRef)) {
                 slot.setCustom(this, callbackGetter);
                 return true;
             }
         } else if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
-            if (JSValueRef value = getProperty(context, thisRef, propertyNameRef, toRef(exec->exceptionSlot()))) {
+            if (JSValueRef value = getProperty(ctx, thisRef, propertyNameRef, toRef(exec->exceptionSlot()))) {
                 // cache the value so we don't have to compute it again
                 // FIXME: This violates the PropertySlot design a little bit.
@@ -132 +132 @@
 void JSCallbackObject::put(ExecState* exec, const Identifier& propertyName, JSValue* value, int attr)
 {
-    JSContextRef context = toRef(exec);
+    JSContextRef ctx = toRef(exec);
     JSObjectRef thisRef = toRef(this);
     JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
@@ -139 +139 @@
     for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
         if (JSObjectSetPropertyCallback setProperty = jsClass->setProperty) {
-            if (setProperty(context, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot())))
+            if (setProperty(ctx, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot())))
                 return;
         }
@@ -148 +148 @@
                     return;
                 if (JSObjectSetPropertyCallback setProperty = entry->setProperty)
-                    setProperty(context, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot()));
+                    setProperty(ctx, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot()));
                 else
                     throwError(exec, ReferenceError, "Writable static value property defined with NULL setProperty callback.");
@@ -174 +174 @@
 bool JSCallbackObject::deleteProperty(ExecState* exec, const Identifier& propertyName)
 {
-    JSContextRef context = toRef(exec);
+    JSContextRef ctx = toRef(exec);
     JSObjectRef thisRef = toRef(this);
     JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
@@ -180 +180 @@
     for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
         if (JSObjectDeletePropertyCallback deleteProperty = jsClass->deleteProperty) {
-            if (deleteProperty(context, thisRef, propertyNameRef, toRef(exec->exceptionSlot())))
+            if (deleteProperty(ctx, thisRef, propertyNameRef, toRef(exec->exceptionSlot())))
                 return true;
         }
@@ -326 +326 @@
 double JSCallbackObject::toNumber(ExecState* exec) const
 {
-    JSContextRef context = toRef(exec);
+    JSContextRef ctx = toRef(exec);
     JSObjectRef thisRef = toRef(this);
 
     for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
         if (JSObjectConvertToTypeCallback convertToType = jsClass->convertToType)
-            if (JSValueRef value = convertToType(context, thisRef, kJSTypeNumber, toRef(exec->exceptionSlot())))
+            if (JSValueRef value = convertToType(ctx, thisRef, kJSTypeNumber, toRef(exec->exceptionSlot())))
                 return toJS(value)->getNumber();
 
@@ -339 +339 @@
 UString JSCallbackObject::toString(ExecState* exec) const
 {
-    JSContextRef context = toRef(exec);
+    JSContextRef ctx = toRef(exec);
     JSObjectRef thisRef = toRef(this);
 
     for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
         if (JSObjectConvertToTypeCallback convertToType = jsClass->convertToType)
-            if (JSValueRef value = convertToType(context, thisRef, kJSTypeString, toRef(exec->exceptionSlot())))
+            if (JSValueRef value = convertToType(ctx, thisRef, kJSTypeString, toRef(exec->exceptionSlot())))
                 return toJS(value)->getString();