From 54b6f546c806537dbcaf882697a18d6ee76b2d15 Mon Sep 17 00:00:00 2001 From: Olli Pettay Date: Tue, 17 Jan 2012 12:20:57 +0200 Subject: [PATCH] Bug 718340 - Don't traverse black windows, r=mccr8,jst --- dom/base/nsGlobalWindow.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index 66a8123be27..7a7030ec548 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -1404,8 +1404,9 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsGlobalWindow) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsGlobalWindow) - if (tmp->mDoc && nsCCUncollectableMarker::InGeneration( - cb, tmp->mDoc->GetMarkedCCGeneration())) { + if ((tmp->mDoc && nsCCUncollectableMarker::InGeneration( + cb, tmp->mDoc->GetMarkedCCGeneration())) || + (nsCCUncollectableMarker::sGeneration && tmp->IsBlack())) { return NS_SUCCESS_INTERRUPTED_TRAVERSE; }