Show
Ignore:
Timestamp:
08/04/08 12:23:14 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35534

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/JavaScriptCore/kjs/JSStaticScopeObject.cpp

    r419 r429  
    3030namespace KJS { 
    3131 
     32JSObject* JSStaticScopeObject::toThisObject(ExecState* exec) const 
     33{ 
     34    return exec->globalThisValue(); 
     35} 
     36 
     37void JSStaticScopeObject::put(ExecState*, const Identifier& propertyName, JSValue* value) 
     38{ 
     39    if (symbolTablePut(propertyName, value)) 
     40        return; 
     41     
     42    ASSERT_NOT_REACHED(); 
     43} 
     44 
    3245void JSStaticScopeObject::putWithAttributes(ExecState*, const Identifier& propertyName, JSValue* value, unsigned attributes) 
    3346{