Changeset 15233 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 8, 2006, 10:42:39 AM (19 years ago)

Author:

ggaren

Message:

Reviewed by TimO.

• Added ability to pass NULL for thisObject when calling JSObjectCallAsFunction, to match JSEvaluate.

• API/JSObjectRef.cpp: (JSObjectCallAsFunction):
• API/JSObjectRef.h:
• API/testapi.c: (main):

Location:

trunk/JavaScriptCore

Files:

• API/JSObjectRef.cpp (modified) (2 diffs)
• API/JSObjectRef.h (modified) (1 diff)
• API/testapi.c (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -218 +218 @@
     JSObject* jsThisObject = toJS(thisObject);
 
+    if (!jsThisObject)
+        jsThisObject = exec->dynamicInterpreter()->globalObject();
+    
     List argList;
     for (size_t i = 0; i < argc; i++)
@@ -226 +229 @@
         if (exception)
             *exception = exec->exception();
+        exec->clearException();
         result = NULL;
-        exec->clearException();
     }
     return result;

trunk/JavaScriptCore/API/JSObjectRef.h

@@ -442 +442 @@
 @param context The execution context to use.
 @param object The JSObject to call as a function.
-@param thisObject The JSObject to use as 'this' in the function call.
+@param thisObject The object to use as "this," or NULL to use the global object as "this."
 @param argc An integer count of the number of arguments in argv.
 @param argv A JSValue array of the  arguments to pass to the function.

trunk/JavaScriptCore/API/testapi.c

@@ -602 +602 @@
     JSClassRelease(nullCallbacksClass);
     
+    functionBuf = JSStringBufferCreateUTF8("return this;");
+    function = JSFunctionMakeWithBody(context, functionBuf, NULL, 1, NULL);
+    JSStringBufferRelease(functionBuf);
+    v = JSObjectCallAsFunction(context, function, NULL, 0, NULL, NULL);
+    assert(JSValueIsEqual(context, v, globalObject));
+    v = JSObjectCallAsFunction(context, function, o, 0, NULL, NULL);
+    assert(JSValueIsEqual(context, v, o));
+    
     char* script = createStringWithContentsOfFile("testapi.js");
     JSStringBufferRef scriptBuf = JSStringBufferCreateUTF8(script);

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-07-08  Geoffrey Garen  <[email protected]>
+
+        Reviewed by TimO.
+
+        - Added ability to pass NULL for thisObject when calling JSObjectCallAsFunction,
+        to match JSEvaluate.
+        
+        * API/JSObjectRef.cpp:
+        (JSObjectCallAsFunction):
+        * API/JSObjectRef.h:
+        * API/testapi.c:
+        (main):
+
 === Safari-521.15 ===