Show
Ignore:
Timestamp:
08/04/08 12:23:14 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35534

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/JavaScriptCore/kjs/JSStaticScopeObject.h

    r419 r429  
    5454        virtual ~JSStaticScopeObject(); 
    5555        bool isDynamicScope() const; 
     56        virtual JSObject* toThisObject(ExecState*) const; 
    5657        virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); 
    5758        virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&, bool& slotIsWriteable); 
     59        virtual void put(ExecState*, const Identifier&, JSValue*); 
    5860        void putWithAttributes(ExecState*, const Identifier&, JSValue*, unsigned attributes); 
    5961    };