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

    r404 r427  
    3838#include "JSSQLTransaction.h" 
    3939#include "Page.h" 
    40 #include <kjs/JSLock.h> 
    4140#include <wtf/MainThread.h> 
    4241#include <wtf/RefCountedLeakCounter.h> 
     
    101100    ExecState* exec = globalObject->globalExec(); 
    102101         
    103     KJS::JSLock lock(false); 
    104          
    105102    JSValue* handleEventFunction = m_data->callback()->get(exec, Identifier(exec, "handleEvent")); 
    106103    CallData handleEventCallData;