wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 703317 - non-threadsafe allocator for nsIntRegion causes TestDataStructures to fail. try=0b82febeb6ea

Browse Source
This commit is contained in:
Benoit Girard 2011-11-29 13:29:03 -05:00
parent c07ed67f19
commit dfe315af0c
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gfx/src/nsRegion.cpp
View File

@ -215,27 +215,52 @@ void RgnRectMemoryAllocator::Free (nsRegion::RgnRect* aRect)
// Global pool for nsRegion::RgnRect allocation // Global pool for nsRegion::RgnRect allocation
static RgnRectMemoryAllocator* gRectPool; static PRUintn gRectPoolTlsIndex;
void RgnRectMemoryAllocatorDTOR(void *priv)
{
RgnRectMemoryAllocator* allocator = (static_cast<RgnRectMemoryAllocator*>(
PR_GetThreadPrivate(gRectPoolTlsIndex)));
delete allocator;
}
nsresult nsRegion::InitStatic() nsresult nsRegion::InitStatic()
{ {
gRectPool = new RgnRectMemoryAllocator(INIT_MEM_CHUNK_ENTRIES); return PR_NewThreadPrivateIndex(&gRectPoolTlsIndex, RgnRectMemoryAllocatorDTOR);
return !gRectPool ? NS_ERROR_OUT_OF_MEMORY : NS_OK;
} }
void nsRegion::ShutdownStatic() void nsRegion::ShutdownStatic()
{ {
delete gRectPool; RgnRectMemoryAllocator* allocator = (static_cast<RgnRectMemoryAllocator*>(
PR_GetThreadPrivate(gRectPoolTlsIndex)));
if (!allocator)
return;
delete allocator;
PR_SetThreadPrivate(gRectPoolTlsIndex, nsnull);
} }
void* nsRegion::RgnRect::operator new (size_t) CPP_THROW_NEW void* nsRegion::RgnRect::operator new (size_t) CPP_THROW_NEW
{ {
return gRectPool->Alloc (); RgnRectMemoryAllocator* allocator = (static_cast<RgnRectMemoryAllocator*>(
PR_GetThreadPrivate(gRectPoolTlsIndex)));
if (!allocator) {
allocator = new RgnRectMemoryAllocator(INIT_MEM_CHUNK_ENTRIES);
PR_SetThreadPrivate(gRectPoolTlsIndex, allocator);
}
return allocator->Alloc ();
} }
void nsRegion::RgnRect::operator delete (void* aRect, size_t) void nsRegion::RgnRect::operator delete (void* aRect, size_t)
{ {
gRectPool->Free (static_cast<RgnRect*>(aRect)); RgnRectMemoryAllocator* allocator = (static_cast<RgnRectMemoryAllocator*>(
PR_GetThreadPrivate(gRectPoolTlsIndex)));
if (!allocator) {
NS_ERROR("Invalid nsRegion::RgnRect delete");
return;
}
allocator->Free (static_cast<RgnRect*>(aRect));
} }