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

Bug 414977 - "insufficient unlink methods in some DOM classes?". Move the warning until after XPConnect deferred releases, r=dbaron, sr=peterv, a=blocking1.9+.

Browse Source
This commit is contained in:
bent.mozilla@gmail.com 2008-02-22 12:25:12 -08:00
parent f009e45200
commit 8fdba1cac1
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
xpcom/base/nsCycleCollector.cpp
View File

@ -1607,22 +1607,6 @@ nsCycleCollector::CollectWhite()
Fault("Failed unroot call while unlinking", pinfo);
}
#ifdef DEBUG_CC
for (i = 0; i < count; ++i) {
PtrInfo *pinfo = mWhiteNodes->ElementAt(i);
if (pinfo->mLangID == nsIProgrammingLanguage::CPLUSPLUS &&
mPurpleBuf.Exists(pinfo->mPointer)) {
printf("nsCycleCollector: %s object @%p is still alive after\n"
" calling RootAndUnlinkJSObjects, Unlink, and Unroot on "
"it! This probably\n"
" means the Unlink implementation was insufficient.\n",
pinfo->mName, pinfo->mPointer);
}
}
#endif
mWhiteNodes->Clear();
#if defined(DEBUG_CC) && !defined(__MINGW32__) && defined(WIN32)
_CrtMemCheckpoint(&ms2);
if (ms2.lTotalCount < ms1.lTotalCount)
@ -2195,6 +2179,27 @@ nsCycleCollector::Collect(PRUint32 aTryCollections)
collected = BeginCollection() && FinishCollection();
}
#ifdef DEBUG_CC
// We wait until after FinishCollection to check the white nodes because
// some objects may outlive CollectWhite but then be freed by
// FinishCycleCollection (like XPConnect's deferred release of native
// objects).
PRUint32 i, count = mWhiteNodes->Length();
for (i = 0; i < count; ++i) {
PtrInfo *pinfo = mWhiteNodes->ElementAt(i);
if (pinfo->mLangID == nsIProgrammingLanguage::CPLUSPLUS &&
mPurpleBuf.Exists(pinfo->mPointer)) {
printf("nsCycleCollector: %s object @%p is still alive after\n"
" calling RootAndUnlinkJSObjects, Unlink, and Unroot on"
" it! This probably\n"
" means the Unlink implementation was insufficient.\n",
pinfo->mName, pinfo->mPointer);
}
}
#endif
mWhiteNodes->Clear();
ClearGraph();
if (!collected)
break;
@ -2364,8 +2369,6 @@ nsCycleCollector::FinishCollection()
mFollowupCollection = PR_TRUE;
ClearGraph();
return collected;
}