Show
Ignore:
Timestamp:
08/20/08 13:23:52 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35853

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/JavaScriptCore/VM/JSPropertyNameIterator.h

    r370 r447  
    4343        virtual ~JSPropertyNameIterator(); 
    4444 
    45         virtual JSType type() const; 
    46         virtual JSValue* toPrimitive(ExecState*, JSType) const; 
     45        virtual JSValue* toPrimitive(ExecState*, PreferredPrimitiveType) const; 
    4746        virtual bool getPrimitiveNumber(ExecState*, double&, JSValue*&); 
    4847        virtual bool toBoolean(ExecState*) const;