Show
Ignore:
Timestamp:
08/20/08 13:23:52 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35853

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/JavaScriptCore/API/JSBase.cpp

    r440 r447  
    3535#include <kjs/interpreter.h> 
    3636#include <kjs/JSGlobalObject.h> 
     37#include <kjs/JSLock.h> 
    3738#include <kjs/JSObject.h> 
    3839 
     
    4344    ExecState* exec = toJS(ctx); 
    4445    exec->globalData().heap->registerThread(); 
     46    JSLock lock(exec); 
    4547 
    4648    JSObject* jsThisObject = toJS(thisObject); 
     
    6769    ExecState* exec = toJS(ctx); 
    6870    exec->globalData().heap->registerThread(); 
     71    JSLock lock(exec); 
    6972 
    7073    Completion completion = Interpreter::checkSyntax(exec->dynamicGlobalObject()->globalExec(), sourceURL->ustring(), startingLineNumber, script->ustring()); 
     
    9295    Heap* heap = globalData.heap; 
    9396 
     97    JSLock lock(globalData.isSharedInstance); 
     98 
    9499    if (!heap->isBusy()) 
    95100        heap->collect();