Bug 785228 - nsGlobalWindow is described twice during traverse, r=mccr8

--HG--
extra : rebase_source : 3ebb0df0d4d20618d03bd9f7be2fedd54d6ef843
This commit is contained in:
Olli Pettay 2012-08-23 14:15:39 -07:00
Родитель 6aa1cbed29
Коммит db4a617dfb
1 изменённых файлов: 3 добавлений и 1 удалений

Просмотреть файл

@ -1246,11 +1246,13 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_BEGIN(nsGlobalWindow)
return tmp->IsBlackForCC(); return tmp->IsBlackForCC();
NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsGlobalWindow) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsGlobalWindow)
if (NS_UNLIKELY(cb.WantDebugInfo())) { if (NS_UNLIKELY(cb.WantDebugInfo())) {
char name[512]; char name[512];
PR_snprintf(name, sizeof(name), "nsGlobalWindow #%ld", tmp->mWindowID); PR_snprintf(name, sizeof(name), "nsGlobalWindow #%ld", tmp->mWindowID);
cb.DescribeRefCountedNode(tmp->mRefCnt.get(), sizeof(nsGlobalWindow), name); cb.DescribeRefCountedNode(tmp->mRefCnt.get(), sizeof(nsGlobalWindow), name);
} else {
NS_IMPL_CYCLE_COLLECTION_DESCRIBE(nsGlobalWindow, tmp->mRefCnt.get())
} }
if (!cb.WantAllTraces() && tmp->IsBlackForCC()) { if (!cb.WantAllTraces() && tmp->IsBlackForCC()) {