From 993e467b510d56e057e0fc25bdff26df83fd2fac Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Fri, 27 Apr 2012 13:37:55 +0300
Subject: [PATCH] Backout Bug 747675 to see if it has caused startup crashes

---
 content/base/src/nsCCUncollectableMarker.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/content/base/src/nsCCUncollectableMarker.cpp b/content/base/src/nsCCUncollectableMarker.cpp
index 7b98ee210df0..2b8d26e74a0d 100644
--- a/content/base/src/nsCCUncollectableMarker.cpp
+++ b/content/base/src/nsCCUncollectableMarker.cpp
@@ -362,6 +362,12 @@ nsCCUncollectableMarker::Observe(nsISupports* aSubject, const char* aTopic,
     }
   }
 
+  if (cleanupJS) {
+    nsContentUtils::UnmarkGrayJSListenersInCCGenerationDocuments(sGeneration);
+    MarkMessageManagers();
+    xpc_UnmarkSkippableJSHolders();
+  }
+
 #ifdef MOZ_XUL
   nsXULPrototypeCache* xulCache = nsXULPrototypeCache::GetInstance();
   if (xulCache) {
@@ -369,18 +375,6 @@ nsCCUncollectableMarker::Observe(nsISupports* aSubject, const char* aTopic,
   }
 #endif
 
-  static bool previousWasJSCleanup = false;
-  if (cleanupJS) {
-    nsContentUtils::UnmarkGrayJSListenersInCCGenerationDocuments(sGeneration);
-    MarkMessageManagers();
-    previousWasJSCleanup = true;
-  } else if (previousWasJSCleanup) {
-    previousWasJSCleanup = false;
-    if (!prepareForCC) {
-      xpc_UnmarkSkippableJSHolders();
-    }
-  }
-
   return NS_OK;
 }