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

Merge m-c to inbound.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-01-29 10:50:01 -05:00
commit d47f9bc40a
5 changed files with 1 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/src/nsDocument.cpp
View File

@ -1373,10 +1373,6 @@ nsDocument::~nsDocument()
("DOCUMENT %p destroyed", this));
#endif
#ifdef DEBUG
nsCycleCollector_DEBUG_wasFreed(static_cast<nsIDocument*>(this));
#endif
NS_ASSERTION(!mIsShowing, "Destroying a currently-showing document");
mInDestructor = true;

24
dom/base/nsGlobalWindow.cpp
View File

@ -1151,10 +1151,6 @@ nsGlobalWindow::~nsGlobalWindow()
CleanUp(true);
#ifdef DEBUG
nsCycleCollector_DEBUG_wasFreed(ToSupports(this));
#endif
nsCOMPtr<nsIDeviceSensors> ac = do_GetService(NS_DEVICE_SENSORS_CONTRACTID);
if (ac)
ac->RemoveWindowAsListener(this);
@ -1285,9 +1281,6 @@ nsGlobalWindow::CleanUp(bool aIgnoreModalDialog)
mOpener = nullptr; // Forces Release
if (mContext) {
#ifdef DEBUG
nsCycleCollector_DEBUG_shouldBeFreed(mContext);
#endif
mContext = nullptr; // Forces Release
}
mChromeEventHandler = nullptr; // Forces Release
@ -1321,9 +1314,6 @@ nsGlobalWindow::CleanUp(bool aIgnoreModalDialog)
}
DisableTimeChangeNotifications();
#ifdef DEBUG
nsCycleCollector_DEBUG_shouldBeFreed(ToSupports(this));
#endif
}
void
@ -1407,11 +1397,6 @@ nsGlobalWindow::FreeInnerObjects()
mDocBaseURI = mDoc->GetDocBaseURI();
}
#ifdef DEBUG
if (mDocument)
nsCycleCollector_DEBUG_shouldBeFreed(nsCOMPtr<nsISupports>(do_QueryInterface(mDocument)));
#endif
// Remove our reference to the document and the document principal.
mDocument = nullptr;
mDoc = nullptr;
@ -1432,10 +1417,6 @@ nsGlobalWindow::FreeInnerObjects()
mAudioContexts[i]->Shutdown();
}
mAudioContexts.Clear();
#ifdef DEBUG
nsCycleCollector_DEBUG_shouldBeFreed(ToSupports(this));
#endif
}
//*****************************************************************************
@ -2598,11 +2579,6 @@ nsGlobalWindow::DetachFromDocShell()
mContext = nullptr;
}
#ifdef DEBUG
nsCycleCollector_DEBUG_shouldBeFreed(mContext);
nsCycleCollector_DEBUG_shouldBeFreed(ToSupports(this));
#endif
mDocShell = nullptr; // Weak Reference
NS_ASSERTION(!mNavigator, "Non-null mNavigator in outer window!");

4
dom/base/nsJSEnvironment.cpp
View File

@ -1136,10 +1136,6 @@ nsJSContext::nsJSContext(JSRuntime *aRuntime, bool aGCOnDestruction,
nsJSContext::~nsJSContext()
{
#ifdef DEBUG
nsCycleCollector_DEBUG_wasFreed(static_cast<nsIScriptContext*>(this));
#endif
*mPrev = mNext;
if (mNext) {
mNext->mPrev = mPrev;

47
xpcom/base/nsCycleCollector.cpp
View File

@ -1100,13 +1100,9 @@ struct nsCycleCollector
#ifdef DEBUG_CC
nsCycleCollectorStats mStats;
FILE *mPtrLog;
PointerSet mExpectedGarbage;
bool LogPurpleAddition(void* aObject, nsCycleCollectionParticipant *cp);
void LogPurpleRemoval(void* aObject);
void ShouldBeFreed(nsISupports *n);
void WasFreed(nsISupports *n);
#endif
};
@ -2545,9 +2541,6 @@ nsCycleCollector::nsCycleCollector() :
mPurpleBuf(mParams)
#endif
{
#ifdef DEBUG_CC
mExpectedGarbage.Init();
#endif
}
@ -3098,24 +3091,6 @@ nsCycleCollector::Shutdown()
mParams.mDoNothing = true;
}
#ifdef DEBUG_CC
void
nsCycleCollector::ShouldBeFreed(nsISupports *n)
{
if (n) {
mExpectedGarbage.PutEntry(n);
}
}
void
nsCycleCollector::WasFreed(nsISupports *n)
{
if (n) {
mExpectedGarbage.RemoveEntry(n);
}
}
#endif
void
nsCycleCollector::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf,
size_t *aObjectSize,
@ -3140,7 +3115,7 @@ nsCycleCollector::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf,
// - mResults: because it's tiny and only contains scalars.
// - mJSRuntime: because it's non-owning and measured by JS reporters.
// - mParams: because it only contains scalars.
// - mStats, mPtrLog, mExpectedGarbage: because they're DEBUG_CC-only.
// - mStats, mPtrLog: because they're DEBUG_CC-only.
}
@ -3183,26 +3158,6 @@ nsCycleCollector_suspectedCount()
return sCollector ? sCollector->SuspectedCount() : 0;
}
#ifdef DEBUG
void
nsCycleCollector_DEBUG_shouldBeFreed(nsISupports *n)
{
#ifdef DEBUG_CC
if (sCollector)
sCollector->ShouldBeFreed(n);
#endif
}
void
nsCycleCollector_DEBUG_wasFreed(nsISupports *n)
{
#ifdef DEBUG_CC
if (sCollector)
sCollector->WasFreed(n);
#endif
}
#endif
class nsCycleCollectorRunner : public nsRunnable
{
nsCycleCollector *mCollector;

5
xpcom/base/nsCycleCollector.h
View File

@ -97,11 +97,6 @@ struct nsCycleCollectionJSRuntime
void nsCycleCollector_registerJSRuntime(nsCycleCollectionJSRuntime *rt);
void nsCycleCollector_forgetJSRuntime();
#ifdef DEBUG
void nsCycleCollector_DEBUG_shouldBeFreed(nsISupports *n);
void nsCycleCollector_DEBUG_wasFreed(nsISupports *n);
#endif
#define NS_CYCLE_COLLECTOR_LOGGER_CID \
{ 0x58be81b4, 0x39d2, 0x437c, \
{ 0x94, 0xea, 0xae, 0xde, 0x2c, 0x62, 0x08, 0xd3 } }