JavaScriptCore-1097.3.tar.gz

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

diff --git a/API/JSCallbackFunction.cpp b/API/JSCallbackFunction.cpp
index 0e434d960eac8f692f85a05fe74bcff55a335896..d287ab7784643487ab5f22a84efa6bbfd7ded560 100644 (file)
--- a/API/JSCallbackFunction.cpp
+++ b/API/JSCallbackFunction.cpp
@@ -24,12 +24,12 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-#include <wtf/Platform.h>

 #include "JSCallbackFunction.h"
 
 #include "APIShims.h"
 #include "APICast.h"
 #include "CodeBlock.h"
 #include "JSCallbackFunction.h"
 
 #include "APIShims.h"
 #include "APICast.h"
 #include "CodeBlock.h"

+#include "ExceptionHelpers.h"

 #include "JSFunction.h"
 #include "FunctionPrototype.h"
 #include <runtime/JSGlobalObject.h>
 #include "JSFunction.h"
 #include "FunctionPrototype.h"
 #include <runtime/JSGlobalObject.h>


@@ -39,39 +39,50 @@
 namespace JSC {
 
 ASSERT_CLASS_FITS_IN_CELL(JSCallbackFunction);
 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, JSObjectCallAsFunctionCallback callback)
+    : InternalFunction(globalObject, globalObject->callbackFunctionStructure())

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

-JSValue JSCallbackFunction::call(ExecState* exec, JSObject* functionObject, JSValue thisValue, const ArgList& args)
+void JSCallbackFunction::finishCreation(JSGlobalData& globalData, const Identifier& name)
+{
+    Base::finishCreation(globalData, name);
+    ASSERT(inherits(&s_info));
+}
+
+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));

 
 

-    int argumentCount = static_cast<int>(args.size());
+    int argumentCount = static_cast<int>(exec->argumentCount());

     Vector<JSValueRef, 16> arguments(argumentCount);
     for (int i = 0; i < argumentCount; i++)
     Vector<JSValueRef, 16> arguments(argumentCount);
     for (int i = 0; i < argumentCount; i++)

-        arguments[i] = toRef(exec, args.at(i));
+        arguments[i] = toRef(exec, exec->argument(i));

 
     JSValueRef exception = 0;
     JSValueRef result;
     {
         APICallbackShim callbackShim(exec);
 
     JSValueRef exception = 0;
     JSValueRef result;
     {
         APICallbackShim callbackShim(exec);

-        result = static_cast<JSCallbackFunction*>(functionObject)->m_callback(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), &exception);
+        result = jsCast<JSCallbackFunction*>(toJS(functionRef))->m_callback(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), &exception);

     }
     if (exception)
     }
     if (exception)

-        exec->setException(toJS(exec, exception));
+        throwError(exec, toJS(exec, exception));
+
+    // result must be a valid JSValue.
+    if (!result)
+        return JSValue::encode(jsUndefined());

 
 

-    return toJS(exec, result);
+    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;