Backed out changeset 0eb4a7009f43 (bug 1401379)

dom/base/nsCCUncollectableMarker.cpp

@@ -508,7 +508,7 @@ mozilla::dom::TraceBlackJS(JSTracer* aTrc, uint32_t aGCNumber, bool aIsShutdownG
   if (windowsById) {
     for (auto iter = windowsById->Iter(); !iter.Done(); iter.Next()) {
       nsGlobalWindow* window = iter.Data();
-      if (!window->IsCleanedUp() && window->IsOuterWindow()) {
+      if (window->GetDocShell() && window->IsOuterWindow()) {
         window->TraceGlobalJSObject(aTrc);
         EventListenerManager* elm = window->GetExistingListenerManager();
         if (elm) {

dom/base/nsGlobalWindow.h

@@ -668,12 +668,6 @@ public:
             mCleanedUp);
   }
 
-  bool
-  IsCleanedUp() const
-  {
-    return mCleanedUp;
-  }
-
   bool
   HadOriginalOpener() const
   {