Changeset 43157 in webkit for trunk/JavaScriptCore/API/JSCallbackFunction.cpp

Timestamp:

May 3, 2009, 12:27:42 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-05-02 Sam Weinig <​[email protected]>

Roll JSC API number marshaling back in.

WebCore:

2009-05-02 Sam Weinig <​[email protected]>

Roll JSC API number marshaling back in.

File:

• trunk/JavaScriptCore/API/JSCallbackFunction.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSCallbackFunction.cpp

@@ -56 +56 @@
     Vector<JSValueRef, 16> arguments(argumentCount);
     for (int i = 0; i < argumentCount; i++)
-        arguments[i] = toRef(args.at(i));
+        arguments[i] = toRef(exec, args.at(i));
 
-    JSLock::DropAllLocks dropAllLocks(exec);
-    return toJS(static_cast<JSCallbackFunction*>(functionObject)->m_callback(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), toRef(exec->exceptionSlot())));
+    JSValueRef exception = 0;
+    JSValueRef result;
+    {
+        JSLock::DropAllLocks dropAllLocks(exec);
+        result = static_cast<JSCallbackFunction*>(functionObject)->m_callback(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), &exception);
+    }
+    if (exception)
+        exec->setException(toJS(exec, exception));
+
+    return toJS(exec, result);
 }