JavaScriptCore-1218.tar.gz

[apple/javascriptcore.git] / API / JSCallbackFunction.cpp

diff --git a/API/JSCallbackFunction.cpp b/API/JSCallbackFunction.cpp
index 86a2ebcfb6ee0283fd02652b43471db4a423ca9d..c29b9077cf24025c71b5d7e80a14f99f5643f111 100644 (file)
--- a/API/JSCallbackFunction.cpp
+++ b/API/JSCallbackFunction.cpp
@@ -24,44 +24,74 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-#include <wtf/Platform.h>

 #include "JSCallbackFunction.h"
 
 #include "JSCallbackFunction.h"
 

+#include "APIShims.h"

 #include "APICast.h"
 #include "APICast.h"

-#include "JSFunction.h"
+#include "CodeBlock.h"
+#include "Error.h"
+#include "ExceptionHelpers.h"

 #include "FunctionPrototype.h"
 #include "FunctionPrototype.h"

-#include <runtime/JSGlobalObject.h>
-#include <runtime/JSLock.h>
+#include "JSFunction.h"
+#include "JSGlobalObject.h"
+#include "JSLock.h"
+#include "Operations.h"

 #include <wtf/Vector.h>
 
 namespace JSC {
 
 #include <wtf/Vector.h>
 
 namespace JSC {
 

-ASSERT_CLASS_FITS_IN_CELL(JSCallbackFunction);
+ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSCallbackFunction);

 
 

-const ClassInfo JSCallbackFunction::info = { "CallbackFunction", &InternalFunction::info, 0, 0 };
+const ClassInfo JSCallbackFunction::s_info = { "CallbackFunction", &InternalFunction::s_info, 0, 0, CREATE_METHOD_TABLE(JSCallbackFunction) };

 
 

-JSCallbackFunction::JSCallbackFunction(ExecState* exec, JSObjectCallAsFunctionCallback callback, const Identifier& name)
-    : InternalFunction(&exec->globalData(), exec->lexicalGlobalObject()->callbackFunctionStructure(), name)
+JSCallbackFunction::JSCallbackFunction(JSGlobalObject* globalObject, Structure* structure, JSObjectCallAsFunctionCallback callback)
+    : InternalFunction(globalObject, structure)

     , m_callback(callback)
 {
 }
 
     , m_callback(callback)
 {
 }
 

-JSValuePtr JSCallbackFunction::call(ExecState* exec, JSObject* functionObject, JSValuePtr thisValue, const ArgList& args)
+void JSCallbackFunction::finishCreation(VM& vm, const String& name)
+{
+    Base::finishCreation(vm, name);
+    ASSERT(inherits(&s_info));
+}
+
+JSCallbackFunction* JSCallbackFunction::create(ExecState* exec, JSGlobalObject* globalObject, JSObjectCallAsFunctionCallback callback, const String& name)
+{
+    JSCallbackFunction* function = new (NotNull, allocateCell<JSCallbackFunction>(*exec->heap())) JSCallbackFunction(globalObject, globalObject->callbackFunctionStructure(), callback);
+    function->finishCreation(exec->vm(), name);
+    return function;
+}
+
+EncodedJSValue JSCallbackFunction::call(ExecState* exec)

 {
     JSContextRef execRef = toRef(exec);
 {
     JSContextRef execRef = toRef(exec);

-    JSObjectRef functionRef = toRef(functionObject);
-    JSObjectRef thisObjRef = toRef(thisValue.toThisObject(exec));
+    JSObjectRef functionRef = toRef(exec->callee());
+    JSObjectRef thisObjRef = toRef(exec->hostThisValue().toThisObject(exec));
+
+    size_t argumentCount = exec->argumentCount();
+    Vector<JSValueRef, 16> arguments;
+    arguments.reserveInitialCapacity(argumentCount);
+    for (size_t i = 0; i < argumentCount; ++i)
+        arguments.uncheckedAppend(toRef(exec, exec->argument(i)));
+
+    JSValueRef exception = 0;
+    JSValueRef result;
+    {
+        APICallbackShim callbackShim(exec);
+        result = jsCast<JSCallbackFunction*>(toJS(functionRef))->m_callback(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), &exception);
+    }
+    if (exception)
+        throwError(exec, toJS(exec, exception));

 
 

-    int argumentCount = static_cast<int>(args.size());
-    Vector<JSValueRef, 16> arguments(argumentCount);
-    for (int i = 0; i < argumentCount; i++)
-        arguments[i] = toRef(args.at(exec, i));
+    // result must be a valid JSValue.
+    if (!result)
+        return JSValue::encode(jsUndefined());

 
 

-    JSLock::DropAllLocks dropAllLocks(exec);
-    return toJS(static_cast<JSCallbackFunction*>(functionObject)->m_callback(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), toRef(exec->exceptionSlot())));
+    return JSValue::encode(toJS(exec, result));

 }
 
 }
 

-CallType JSCallbackFunction::getCallData(CallData& callData)
+CallType JSCallbackFunction::getCallData(JSCell*, CallData& callData)

 {
     callData.native.function = call;
     return CallTypeHost;
 {
     callData.native.function = call;
     return CallTypeHost;