From b11540684c827dbf2d753b4675e931c9dd2f9c63 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Sat, 11 Feb 2012 03:21:26 +0200
Subject: [PATCH] Bug 725768 - BBP for ObjectHolders, additional patch, mccr8

---
 content/base/src/nsGenericElement.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 39be8f153b9c..bc641648b143 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -4704,12 +4704,15 @@ nsGenericElement::CanSkip(nsINode* aNode)
     }
   }
 
-  if (!foundBlack) {
+  if (!currentDoc || !foundBlack) { 
     if (!gPurpleRoots) {
       gPurpleRoots = new nsAutoTArray<nsINode*, 1020>();
     }
     root->SetIsPurpleRoot(true);
     gPurpleRoots->AppendElement(root);
+  }
+
+  if (!foundBlack) {
     return false;
   }