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

    r404 r427  
    3636#include "ScriptController.h" 
    3737#include "JSSQLError.h" 
    38 #include <kjs/JSLock.h> 
    3938 
    4039namespace WebCore { 
     
    5857    JSGlobalObject* globalObject = m_frame->script()->globalObject(); 
    5958    ExecState* exec = globalObject->globalExec(); 
    60          
    61     KJS::JSLock lock(false); 
    6259         
    6360    JSValue* function = m_callback->get(exec, Identifier(exec, "handleEvent"));