JavaScriptCore-1218.35.tar.gz

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

diff --git a/API/JSCallbackFunction.h b/API/JSCallbackFunction.h
index fec4136f83c6d67a1444201b1ceb10a7304757b0..ea1d1abb48094470178198ff89e1e6c10a25e83a 100644 (file)
--- a/API/JSCallbackFunction.h
+++ b/API/JSCallbackFunction.h
@@ -32,33 +32,28 @@
 namespace JSC {
 
 class JSCallbackFunction : public InternalFunction {
 namespace JSC {
 
 class JSCallbackFunction : public InternalFunction {

-protected:
-    JSCallbackFunction(JSGlobalObject*, JSObjectCallAsFunctionCallback);
-    void finishCreation(JSGlobalData&, const Identifier& name);
-
+    friend struct APICallbackFunction;

 public:
     typedef InternalFunction Base;
 
 public:
     typedef InternalFunction Base;
 

-    static JSCallbackFunction* create(ExecState* exec, JSGlobalObject* globalObject, JSObjectCallAsFunctionCallback callback, const Identifier& name)
-    {
-        JSCallbackFunction* function = new (NotNull, allocateCell<JSCallbackFunction>(*exec->heap())) JSCallbackFunction(globalObject, callback);
-        function->finishCreation(exec->globalData(), name);
-        return function;
-    }
+    static JSCallbackFunction* create(ExecState*, JSGlobalObject*, JSObjectCallAsFunctionCallback, const String& name);

 
     static const ClassInfo s_info;
     
     // InternalFunction mish-mashes constructor and function behavior -- we should 
     // refactor the code so this override isn't necessary
 
     static const ClassInfo s_info;
     
     // InternalFunction mish-mashes constructor and function behavior -- we should 
     // refactor the code so this override isn't necessary

-    static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue proto) 
+    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue proto) 

     { 
     { 

-        return Structure::create(globalData, globalObject, proto, TypeInfo(ObjectType, StructureFlags), &s_info); 
+        return Structure::create(vm, globalObject, proto, TypeInfo(ObjectType, StructureFlags), &s_info); 

     }
 
 private:
     }
 
 private:

+    JSCallbackFunction(JSGlobalObject*, Structure*, JSObjectCallAsFunctionCallback);
+    void finishCreation(VM&, const String& name);
+

     static CallType getCallData(JSCell*, CallData&);
 
     static CallType getCallData(JSCell*, CallData&);
 

-    static EncodedJSValue JSC_HOST_CALL call(ExecState*);
+    JSObjectCallAsFunctionCallback functionCallback() { return m_callback; }

 
     JSObjectCallAsFunctionCallback m_callback;
 };
 
     JSObjectCallAsFunctionCallback m_callback;
 };