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.cpp

    r381 r447  
    3939} 
    4040 
    41 JSValue* GetterSetter::toPrimitive(ExecState*, JSType) const 
     41JSValue* GetterSetter::toPrimitive(ExecState*, PreferredPrimitiveType) const 
    4242{ 
    4343    ASSERT_NOT_REACHED(); 
     
    7777} 
    7878 
     79bool GetterSetter::isGetterSetter() const 
     80{ 
     81    return true; 
     82} 
     83 
    7984} // namespace KJS