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

    r396 r427  
    2929#include "JSDOMWindow.h" 
    3030#include <kjs/JSGlobalData.h> 
    31 #include <kjs/JSLock.h> 
    3231#include <kjs/collector.h> 
    3332 
    …… 
    4443static void* collect(void*) 
    4544{ 
    46     JSLock lock(false); 
    4745    JSDOMWindow::commonJSGlobalData()->heap->collect(); 
    4846    return 0; 
    …… 
    7068void GCController::gcTimerFired(Timer<GCController>*) 
    7169{ 
    72     JSLock lock(false); 
    7370    JSDOMWindow::commonJSGlobalData()->heap->collect(); 
    7471} 
    …… 
    7673void GCController::garbageCollectNow() 
    7774{ 
    78     JSLock lock(false); 
    7975    JSDOMWindow::commonJSGlobalData()->heap->collect(); 
    8076}