JavaScriptCore-1097.13.tar.gz

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

diff --git a/runtime/InternalFunction.h b/runtime/InternalFunction.h
index 310644cedc05c8561504be40baf52cbd5ee59362..532bd0c8d4b068744c90113272eac83a761a2187 100644 (file)
--- a/runtime/InternalFunction.h
+++ b/runtime/InternalFunction.h
@@ -31,33 +31,36 @@ namespace JSC {
 
     class FunctionPrototype;
 
 
     class FunctionPrototype;
 

-    class InternalFunction : public JSObject {
+    class InternalFunction : public JSNonFinalObject {

     public:
     public:

-        virtual const ClassInfo* classInfo() const; 
-        static JS_EXPORTDATA const ClassInfo info;
+        typedef JSNonFinalObject Base;

 
 

-        const UString& name(JSGlobalData*);
-        const UString displayName(JSGlobalData*);
-        const UString calculatedDisplayName(JSGlobalData*);
+        static JS_EXPORTDATA const ClassInfo s_info;

 
 

-        static PassRefPtr<Structure> createStructure(JSValue proto) 
+        JS_EXPORT_PRIVATE const UString& name(ExecState*);
+        const UString displayName(ExecState*);
+        const UString calculatedDisplayName(ExecState*);
+
+        static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue proto) 

         { 
         { 

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

         }
 
     protected:
         }
 
     protected:

-        InternalFunction(PassRefPtr<Structure> structure) : JSObject(structure) { }
-        InternalFunction(JSGlobalData*, PassRefPtr<Structure>, const Identifier&);
+        static const unsigned StructureFlags = ImplementsHasInstance | JSObject::StructureFlags;
+
+        JS_EXPORT_PRIVATE InternalFunction(JSGlobalObject*, Structure*);
+
+        JS_EXPORT_PRIVATE void finishCreation(JSGlobalData&, const Identifier& name);

 
 

-    private:
-        virtual CallType getCallData(CallData&) = 0;
+        static CallType getCallData(JSCell*, CallData&);

     };
 
     InternalFunction* asInternalFunction(JSValue);
 
     inline InternalFunction* asInternalFunction(JSValue value)
     {
     };
 
     InternalFunction* asInternalFunction(JSValue);
 
     inline InternalFunction* asInternalFunction(JSValue value)
     {

-        ASSERT(asObject(value)->inherits(&InternalFunction::info));
+        ASSERT(asObject(value)->inherits(&InternalFunction::s_info));

         return static_cast<InternalFunction*>(asObject(value));
     }
 
         return static_cast<InternalFunction*>(asObject(value));
     }