Changeset 447 for trunk/JavaScriptCore/API/JSCallbackFunction.cpp

Timestamp:

08/20/08 13:23:52 (5 months ago)

Author:

mbensi

Message:

merge with webkit revision 35853

Files:

• trunk/JavaScriptCore/API/JSCallbackFunction.cpp (modified) (2 diffs)

trunk/JavaScriptCore/API/JSCallbackFunction.cpp

@@ -33 +33 @@
-#include "FunctionPrototype.h"
-#include <kjs/JSGlobalObject.h>
+#include <kjs/JSLock.h>
-#include <wtf/Vector.h>
-
@@ -65 +66 @@
-        arguments[i] = toRef(args.at(exec, i));
-
+    JSLock::DropAllLocks dropAllLocks(exec);
-    return toJS(static_cast<JSCallbackFunction*>(functionObject)->m_callback(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), toRef(exec->exceptionSlot())));
-}