Changeset 15481 in webkit for trunk/JavaScriptCore/API/JSContextRef.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/JSContextRef.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -47 +47 @@
 
     Interpreter* interpreter = new Interpreter(globalObject); // adds the built-in object prototype to the global object
-    JSGlobalContextRef context = reinterpret_cast<JSGlobalContextRef>(interpreter->globalExec());
-    return JSGlobalContextRetain(context);
+    JSGlobalContextRef ctx = reinterpret_cast<JSGlobalContextRef>(interpreter->globalExec());
+    return JSGlobalContextRetain(ctx);
 }
 
-JSGlobalContextRef JSGlobalContextRetain(JSGlobalContextRef context)
+JSGlobalContextRef JSGlobalContextRetain(JSGlobalContextRef ctx)
 {
     JSLock lock;
-    ExecState* exec = toJS(context);
+    ExecState* exec = toJS(ctx);
     exec->dynamicInterpreter()->ref();
-    return context;
+    return ctx;
 }
 
-void JSGlobalContextRelease(JSGlobalContextRef context)
+void JSGlobalContextRelease(JSGlobalContextRef ctx)
 {
     JSLock lock;
-    ExecState* exec = toJS(context);
+    ExecState* exec = toJS(ctx);
     exec->dynamicInterpreter()->deref();
 }
 
-JSObjectRef JSContextGetGlobalObject(JSContextRef context)
+JSObjectRef JSContextGetGlobalObject(JSContextRef ctx)
 {
-    ExecState* exec = toJS(context);
+    ExecState* exec = toJS(ctx);
     return toRef(exec->dynamicInterpreter()->globalObject());
 }