Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-15 11:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 20743 -- better strategy for low-memory handling when allocating image GWorlds. r=pierre, sr=dcone.

Browse Source
This commit is contained in:
sfraser%netscape.com 2000-10-19 21:17:13 +00:00
parent 693abc1d79
commit 64d6eb3e8e
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/src/mac/nsDrawingSurfaceMac.cpp
View File

@ -270,8 +270,8 @@ NS_IMETHODIMP nsDrawingSurfaceMac :: Init(PRUint32 aDepth,PRUint32 aWidth,PRUint
// Quick and dirty check to make sure there is some memory available.
// GWorld allocations in temp mem can still fail if the heap is totally
// full, because some stuff is allocated in the heap
const long kReserveHeapFreeSpace = (256 * 1024);
const long kReserverHeapContigSpace = (128 * 1024);
const long kReserveHeapFreeSpace = (1024 * 1024);
const long kReserveHeapContigSpace = (512 * 1024);
QDErr err = noErr;
long totalSpace, contiguousSpace;
@ -284,7 +284,7 @@ NS_IMETHODIMP nsDrawingSurfaceMac :: Init(PRUint32 aDepth,PRUint32 aWidth,PRUint
// only try the heap if there is enough space
::PurgeSpace(&totalSpace, &contiguousSpace); // this does not purge memory, just measure it
if (totalSpace > kReserveHeapFreeSpace && contiguousSpace > kReserverHeapContigSpace)
if (totalSpace > kReserveHeapFreeSpace && contiguousSpace > kReserveHeapContigSpace)
::NewGWorld(&offscreenGWorld, depth, &macRect, nsnull, nsnull, 0);
}
}
@ -293,7 +293,7 @@ NS_IMETHODIMP nsDrawingSurfaceMac :: Init(PRUint32 aDepth,PRUint32 aWidth,PRUint
// only try the heap if there is enough space
::PurgeSpace(&totalSpace, &contiguousSpace); // this does not purge memory, just measure it
if (totalSpace > kReserveHeapFreeSpace && contiguousSpace > kReserverHeapContigSpace)
if (totalSpace > kReserveHeapFreeSpace && contiguousSpace > kReserveHeapContigSpace)
::NewGWorld(&offscreenGWorld, depth, &macRect, nsnull, nsnull, 0);
if (!offscreenGWorld)

41
gfx/src/mac/nsImageMac.cpp
View File

@ -490,26 +490,45 @@ OSErr nsImageMac::AllocateGWorld(PRInt16 depth, CTabHandle colorTable, const Rec
{
*outGWorld = nsnull;
// Quick and dirty check to make sure there is some memory available.
// GWorld allocations in temp mem can still fail if the heap is totally
// full, because some stuff is allocated in the heap
const long kReserveHeapFreeSpace = (256 * 1024);
const long kReserverHeapContigSpace = (128 * 1024);
// We have to be careful here not to fill the heap with GWorld pieces.
// The key to understanding this is that, even if you allocate a GWorld
// with the 'useTempMem' flag, it puts data handles in the heap (GDevices,
// color tables etc).
//
// The strategy is this:
// 1. If we have plenty of heap space free, allocate the GWorld in
// the heap.
//
// 2. When below a certain threshold of free space in the heap,
// allocate GWorlds in temp mem.
//
// 3. When memory is really tight, refuse to allocate a GWorld at
// all.
// threshold at which we go to temp mem
const long kUseTempMemFreeSpace = (1024 * 1024);
const long kUseTempMemContigSpace = (768 * 1024);
long totalSpace, contiguousSpace;
::PurgeSpace(&totalSpace, &contiguousSpace); // this does not purge memory!
if (totalSpace > kReserveHeapFreeSpace && contiguousSpace > kReserverHeapContigSpace)
if (totalSpace > kUseTempMemFreeSpace && contiguousSpace > kUseTempMemContigSpace)
{
::NewGWorld(outGWorld, depth, &bounds, colorTable, nsnull, 0);
if (*outGWorld) return noErr;
}
::NewGWorld(outGWorld, depth, &bounds, colorTable, nsnull, useTempMem);
if (!*outGWorld)
return memFullErr;
return noErr;
// theshold at which we refuse to allocate at all
const long kReserveHeapFreeSpace = (512 * 1024);
const long kReserveHeapContigSpace = (384 * 1024);
if (totalSpace > kReserveHeapFreeSpace && contiguousSpace > kReserveHeapContigSpace)
{
::NewGWorld(outGWorld, depth, &bounds, colorTable, nsnull, useTempMem);
if (*outGWorld) return noErr;
}
return memFullErr;
}