Changeset 43160 in webkit for trunk/JavaScriptCore/API/JSCallbackConstructor.cpp

Timestamp:

May 3, 2009, 2:02:04 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

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

Roll JSC API number marshaling back in one last time (I hope).

WebCore:

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

Roll JSC API number marshaling back in one last time (I hope).

File:

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

trunk/JavaScriptCore/API/JSCallbackConstructor.cpp

@@ -62 +62 @@
         Vector<JSValueRef, 16> arguments(argumentCount);
         for (int i = 0; i < argumentCount; i++)
-            arguments[i] = toRef(args.at(i));
-            
-        JSLock::DropAllLocks dropAllLocks(exec);
-        return toJS(callback(ctx, constructorRef, argumentCount, arguments.data(), toRef(exec->exceptionSlot())));
+            arguments[i] = toRef(exec, args.at(i));
+
+        JSValueRef exception = 0;
+        JSObjectRef result;
+        {
+            JSLock::DropAllLocks dropAllLocks(exec);
+            result = callback(ctx, constructorRef, argumentCount, arguments.data(), &exception);
+        }
+        if (exception)
+            exec->setException(toJS(exec, exception));
+        return toJS(result);
     }