Show
Ignore:
Timestamp:
08/18/08 11:14:49 (5 months ago)
Author:
odole
Message:

merge with webkit revision 35814

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/JavaScriptCore/kjs/InternalFunction.h

    r402 r440  
    3636        virtual const ClassInfo* classInfo() const { return &info; } 
    3737        static const ClassInfo info; 
    38  
    39         virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); 
    40         virtual void put(ExecState*, const Identifier& propertyName, JSValue*); 
    41         virtual bool deleteProperty(ExecState*, const Identifier& propertyName); 
    42  
    43         const Identifier& functionName() const { return m_name; } 
     38         
     39        const UString& name(ExecState*); 
    4440 
    4541    protected: 
    46         InternalFunction(); 
    47         InternalFunction(FunctionPrototype*, const Identifier&); 
     42        InternalFunction(ExecState*); 
     43        InternalFunction(ExecState*, FunctionPrototype*, const Identifier&); 
    4844 
    4945    private: 
    50         static JSValue* nameGetter(ExecState*, const Identifier&, const PropertySlot&); 
    5146        virtual CallType getCallData(CallData&) = 0; 
    5247        virtual bool implementsHasInstance() const; 
    53  
    54         Identifier m_name; 
    5548    }; 
    5649