Show
Ignore:
Timestamp:
08/13/08 13:49:09 (5 months ago)
Author:
odole
Message:

merge with webkit revision 35706

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/JavaScriptCore/API/JSContextRef.cpp

    r427 r436  
    102102        ASSERT(!heap->isBusy()); 
    103103 
    104         // Heap::destroy() will delete JSGlobalObject, which will in turn delete JSGlobalData, which will 
     104        // Heap destructor will delete JSGlobalObject, which will in turn delete JSGlobalData, which will 
    105105        // delete the heap, which would cause a crash if allowed. 
    106106        globalData.heap = 0;