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

    r437 r440  
    4343namespace KJS { 
    4444 
     45ASSERT_CLASS_FITS_IN_CELL(JSObject); 
     46 
    4547void JSObject::mark() 
    4648{ 
    …… 
    461463} 
    462464 
    463 void JSObject::putDirectFunction(InternalFunction* function, unsigned attr) 
    464 { 
    465     putDirect(function->functionName(), function, attr); 
     465void JSObject::putDirectFunction(ExecState* exec, InternalFunction* function, unsigned attr) 
     466{ 
     467    putDirect(Identifier(exec, function->name(exec)), function, attr); 
    466468} 
    467469