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

    r381 r440  
    2525 
    2626namespace KJS { 
     27 
     28ASSERT_CLASS_FITS_IN_CELL(StringObject); 
    2729 
    2830const ClassInfo StringObject::info = { "String", 0, 0, 0 }; 
     
    5557bool StringObject::getOwnPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot) 
    5658{ 
    57     if (internalValue()->getStringPropertySlot(propertyName, slot)) 
     59    if (internalValue()->getStringPropertySlot(exec, propertyName, slot)) 
    5860        return true;     
    5961    return JSObject::getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot);