Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug 124517 -- double delete caused by making more than one nsMacMemoryCushion object (one for each event loop). This should fix a ton of random crashes on Mac. r=pinkerton, sr=beard

Browse Source
This commit is contained in:
sfraser%netscape.com 2002-02-12 01:22:23 +00:00
parent 49d0a35f7d
commit db23565e42
4 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
widget/src/mac/nsAppShell.cpp
View File

@ -93,22 +93,17 @@ NS_IMETHODIMP nsAppShell::SetDispatchListener(nsDispatchListener* aDispatchListe
NS_IMETHODIMP nsAppShell::Create(int* argc, char ** argv)
{
nsresult rv;
rv = NS_GetCurrentToolkit(getter_AddRefs(mToolkit));
if (NS_FAILED(rv))
return rv;
nsIToolkit* toolkit = mToolkit.get();
mMacPump.reset(new nsMacMessagePump(static_cast<nsToolkit*>(toolkit)));
mMacMemoryCushion.reset(new nsMacMemoryCushion());
nsresult rv = NS_GetCurrentToolkit(getter_AddRefs(mToolkit));
if (NS_FAILED(rv))
return rv;
if (!mMacPump.get() || !mMacMemoryCushion.get())
nsIToolkit* toolkit = mToolkit.get();
mMacPump.reset(new nsMacMessagePump(static_cast<nsToolkit*>(toolkit)));
if (!mMacPump.get() || ! nsMacMemoryCushion::EnsureMemoryCushion())
return NS_ERROR_OUT_OF_MEMORY;
OSErr err = mMacMemoryCushion->Init(nsMacMemoryCushion::kMemoryBufferSize, nsMacMemoryCushion::kMemoryReserveSize);
if (err != noErr)
return NS_ERROR_FAILURE;
return NS_OK;
return NS_OK;
}
//-------------------------------------------------------------------------
@ -121,7 +116,6 @@ NS_IMETHODIMP nsAppShell::Run(void)
if (!mMacPump.get())
return NS_ERROR_NOT_INITIALIZED;
mMacMemoryCushion->StartRepeating();
mMacPump->StartRunning();
mMacPump->DoMessagePump();

3
widget/src/mac/nsAppShell.h
View File

@ -56,8 +56,6 @@
using std::auto_ptr;
class nsMacMessagePump;
class nsMacMemoryCushion;
class nsAppShell : public nsIAppShell
{
@ -72,7 +70,6 @@ class nsAppShell : public nsIAppShell
nsDispatchListener *mDispatchListener; // note: we don't own this, but it can be NULL
nsCOMPtr<nsIToolkit> mToolkit;
auto_ptr<nsMacMessagePump> mMacPump;
auto_ptr<nsMacMemoryCushion> mMacMemoryCushion;
PRBool mExitCalled;
static PRBool mInitializedToolbox;
};

29
widget/src/mac/nsToolkit.cpp
View File

@ -384,9 +384,15 @@ nsMacMemoryCushion::nsMacMemoryCushion()
nsMacMemoryCushion::~nsMacMemoryCushion()
{
StopRepeating();
::SetGrowZone(nsnull);
NS_ASSERTION(sMemoryReserve, "Memory reserve was nil");
if (sMemoryReserve)
{
::DisposeHandle(sMemoryReserve);
sMemoryReserve = nil;
}
if (mBufferHandle)
::DisposeHandle(mBufferHandle);
@ -460,3 +466,26 @@ pascal long nsMacMemoryCushion::GrowZoneProc(Size amountNeeded)
return freedMem;
}
std::auto_ptr<nsMacMemoryCushion> gMemoryCushion;
Boolean nsMacMemoryCushion::EnsureMemoryCushion()
{
if (!gMemoryCushion.get())
{
nsMacMemoryCushion* softFluffyCushion = new nsMacMemoryCushion();
if (!softFluffyCushion) return false;
OSErr err = softFluffyCushion->Init(nsMacMemoryCushion::kMemoryBufferSize, nsMacMemoryCushion::kMemoryReserveSize);
if (err != noErr)
{
delete softFluffyCushion;
return false;
}
gMemoryCushion.reset(softFluffyCushion);
softFluffyCushion->StartRepeating();
}
return true;
}

7
widget/src/mac/nsToolkit.h
View File

@ -38,6 +38,8 @@
#ifndef TOOLKIT_H
#define TOOLKIT_H
#include <memory>
#include "nsIToolkit.h"
#include "nsRepeater.h"
@ -166,10 +168,11 @@ protected:
Boolean RecoverMemoryReserve(Size reserveSize);
static pascal long GrowZoneProc(Size amountNeeded);
public:
static pascal long GrowZoneProc(Size amountNeeded);
static Boolean EnsureMemoryCushion();
protected: