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

    r424 r427  
    6363    initializeThreading(); 
    6464 
    65     JSLock lock(true); 
    66  
    6765    JSGlobalData* globalData = toJS(group); 
    6866 
     
    8583    ExecState* exec = toJS(ctx); 
    8684    exec->globalData().heap->registerThread(); 
    87     JSLock lock(exec); 
    8885 
    8986    gcProtect(exec->dynamicGlobalObject()); 
     
    9491{ 
    9592    ExecState* exec = toJS(ctx); 
    96     JSLock lock(exec); 
    9793 
    9894    gcUnprotect(exec->dynamicGlobalObject());