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

    r404 r427  
    3737#include "JSDOMBinding.h" 
    3838#include "ScriptController.h" 
    39 #include <kjs/JSLock.h> 
    4039 
    4140namespace WebCore { 
     
    5958    JSGlobalObject* globalObject = m_frame->script()->globalObject(); 
    6059    ExecState* exec = globalObject->globalExec(); 
    61          
    62     KJS::JSLock lock(false); 
    6360         
    6461    JSValue* function = m_callback->get(exec, Identifier(exec, "handleEvent"));