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/kjs/GetterSetter.h

    r381 r447  
    4040        } 
    4141 
    42         JSType type() const { return GetterSetterType; } 
    43  
    4442        virtual void mark(); 
    4543 
    …… 
    5048 
    5149    private: 
    52         virtual JSValue* toPrimitive(ExecState*, JSType preferred) const; 
     50        virtual bool isGetterSetter() const; 
     51 
     52        virtual JSValue* toPrimitive(ExecState*, PreferredPrimitiveType) const; 
    5353        virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*& value); 
    5454        virtual bool toBoolean(ExecState*) const;