JavaScriptCore-7600.1.4.17.5.tar.gz

[apple/javascriptcore.git] / runtime / JSBoundFunction.h

diff --git a/runtime/JSBoundFunction.h b/runtime/JSBoundFunction.h
index e54d45883dfde4c29809a7cac7af259681c8ed90..7852f78ce39059b5643e49e0f9df1cd7edc8e0b8 100644 (file)
--- a/runtime/JSBoundFunction.h
+++ b/runtime/JSBoundFunction.h
@@ -37,21 +37,23 @@ class JSBoundFunction : public JSFunction {
 public:
     typedef JSFunction Base;
 
 public:
     typedef JSFunction Base;
 

-    static JSBoundFunction* create(ExecState*, JSGlobalObject*, JSObject* targetFunction, JSValue boundThis, JSValue boundArgs, int, const Identifier&);
+    static JSBoundFunction* create(VM&, JSGlobalObject*, JSObject* targetFunction, JSValue boundThis, JSValue boundArgs, int, const String&);
+    
+    static void destroy(JSCell*);

 
 

-    static bool hasInstance(JSObject*, ExecState*, JSValue, JSValue proto);
+    static bool customHasInstance(JSObject*, ExecState*, JSValue);

 
     JSObject* targetFunction() { return m_targetFunction.get(); }
     JSValue boundThis() { return m_boundThis.get(); }
     JSValue boundArgs() { return m_boundArgs.get(); }
 
 
     JSObject* targetFunction() { return m_targetFunction.get(); }
     JSValue boundThis() { return m_boundThis.get(); }
     JSValue boundArgs() { return m_boundArgs.get(); }
 

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

     {
         ASSERT(globalObject);
     {
         ASSERT(globalObject);

-        return Structure::create(globalData, globalObject, prototype, TypeInfo(JSFunctionType, StructureFlags), &s_info); 
+        return Structure::create(vm, globalObject, prototype, TypeInfo(JSFunctionType, StructureFlags), info()); 

     }
 
     }
 

-    static const ClassInfo s_info;
+    DECLARE_INFO;

 
 protected:
     const static unsigned StructureFlags = OverridesHasInstance | OverridesVisitChildren | Base::StructureFlags;
 
 protected:
     const static unsigned StructureFlags = OverridesHasInstance | OverridesVisitChildren | Base::StructureFlags;


@@ -59,9 +61,9 @@ protected:
     static void visitChildren(JSCell*, SlotVisitor&);
 
 private:
     static void visitChildren(JSCell*, SlotVisitor&);
 
 private:

-    JSBoundFunction(ExecState*, JSGlobalObject*, Structure*, JSObject* targetFunction, JSValue boundThis, JSValue boundArgs);
+    JSBoundFunction(VM&, JSGlobalObject*, Structure*, JSObject* targetFunction, JSValue boundThis, JSValue boundArgs);

     
     

-    void finishCreation(ExecState*, NativeExecutable*, int, const Identifier&);
+    void finishCreation(VM&, NativeExecutable*, int, const String&);

 
     WriteBarrier<JSObject> m_targetFunction;
     WriteBarrier<Unknown> m_boundThis;
 
     WriteBarrier<JSObject> m_targetFunction;
     WriteBarrier<Unknown> m_boundThis;