Show
Ignore:
Timestamp:
08/01/08 14:47:24 (5 months ago)
Author:
sroret
Message:

merge with webkit revision 35510

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/WebCore/bindings/js/JSDOMWindowBase.cpp

    r418 r427  
    6262#include "htmlediting.h" 
    6363#include <kjs/Error.h> 
    64 #include <kjs/JSLock.h> 
    6564#include <wtf/AlwaysInline.h> 
    6665#include <wtf/MathExtras.h> 
    …… 
    111110    virtual ~DOMWindowTimer() 
    112111    { 
    113         JSLock lock(false); 
    114112        delete m_action; 
    115113    } 
    …… 
    872870void JSDOMWindowBase::clear() 
    873871{ 
    874   JSLock lock(false); 
    875  
    876   if (d->m_returnValueSlot && !*d->m_returnValueSlot) 
    877     *d->m_returnValueSlot = getDirect(Identifier(globalExec(), "returnValue")); 
    878  
    879   clearAllTimeouts(); 
    880   clearHelperObjectProperties(); 
     872    if (d->m_returnValueSlot && !*d->m_returnValueSlot) 
     873        *d->m_returnValueSlot = getDirect(Identifier(globalExec(), "returnValue")); 
     874 
     875    clearAllTimeouts(); 
     876    clearHelperObjectProperties(); 
    881877} 
    882878 
    …… 
    12721268    action->execute(shell()); 
    12731269 
    1274     JSLock lock(false); 
    12751270    delete action; 
    12761271}