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/kjs/interpreter.cpp

    r370 r427  
    2626#include "ExecState.h" 
    2727#include "JSGlobalObject.h" 
    28 #include "JSLock.h" 
    2928#include "Machine.h" 
    3029#include "Parser.h" 
     
    4746Completion Interpreter::checkSyntax(ExecState* exec, const UString& sourceURL, int startingLineNumber, PassRefPtr<SourceProvider> source) 
    4847{ 
    49     JSLock lock(exec); 
    50  
    5148    int errLine; 
    5249    UString errMsg; 
     
    6562Completion Interpreter::evaluate(ExecState* exec, ScopeChain& scopeChain, const UString& sourceURL, int startingLineNumber, PassRefPtr<SourceProvider> source, JSValue* thisValue) 
    6663{ 
    67     JSLock lock(exec); 
    68      
    6964    // parse the source code 
    7065    int sourceId;