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/JavaScriptCore/API/JSCallbackFunction.cpp

    r414 r427  
    3333#include "FunctionPrototype.h" 
    3434#include <kjs/JSGlobalObject.h> 
    35 #include <kjs/JSLock.h> 
    3635#include <wtf/Vector.h> 
    3736 
     
    6463        arguments[i] = toRef(args.at(exec, i)); 
    6564 
    66     JSLock::DropAllLocks dropAllLocks(exec); 
    6765    return toJS(static_cast<JSCallbackFunction*>(functionObject)->m_callback(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), toRef(exec->exceptionSlot()))); 
    6866}