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

    r414 r427  
    3232#include "JSDOMWindow.h" 
    3333#include "ScriptController.h" 
    34 #include <kjs/JSLock.h> 
    3534 
    3635using namespace KJS; 
     
    5655 
    5756    frame->script()->setProcessingTimerCallback(true); 
    58  
    59     JSLock lock(false); 
    6057 
    6158    if (m_function) {