Bug 913130, part 1 - Modify nsCycleCollector::Collect to allow it to be used at shutdown. r=smaug

xpcom/base/nsCycleCollector.cpp

@@ -967,7 +967,8 @@ private:
     void ShutdownCollect(nsICycleCollectorListener *aListener);
 
 public:
-    void Collect(ccType aCCType,
+    bool Collect(ccType aCCType,
+                 nsTArray<PtrInfo*> *aWhiteNodes,
                  nsCycleCollectorResults *aResults,
                  nsICycleCollectorListener *aListener);
 
@@ -2682,25 +2683,24 @@ nsCycleCollector::ShutdownCollect(nsICycleCollectorListener *aListener)
     CleanupAfterCollection();
 }
 
-void
+bool
 nsCycleCollector::Collect(ccType aCCType,
+                          nsTArray<PtrInfo*> *aWhiteNodes,
                           nsCycleCollectorResults *aResults,
                           nsICycleCollectorListener *aListener)
 {
     CheckThreadSafety();
 
-    // On a WantAllTraces CC, force a synchronous global GC to prevent
+    bool forceGC = (aCCType == ShutdownCC);
-    // hijinks from ForgetSkippable and compartmental GCs.
+    if (!forceGC && aListener) {
-    bool wantAllTraces = false;
+        // On a WantAllTraces CC, force a synchronous global GC to prevent
-    if (aListener) {
+        // hijinks from ForgetSkippable and compartmental GCs.
-        aListener->GetWantAllTraces(&wantAllTraces);
+        aListener->GetWantAllTraces(&forceGC);
     }
+    FixGrayBits(forceGC);
 
-    FixGrayBits(wantAllTraces);
+    if (!PrepareForCollection(aResults, aWhiteNodes)) {
-
+        return false;
-    nsAutoTArray<PtrInfo*, 4000> whiteNodes;
-    if (!PrepareForCollection(aResults, &whiteNodes)) {
-        return;
     }
 
     FreeSnowWhite(true);
@@ -2710,8 +2710,9 @@ nsCycleCollector::Collect(ccType aCCType,
     }
 
     BeginCollection(aCCType, aListener);
-    FinishCollection(aListener);
+    bool collectedAny = FinishCollection(aListener);
     CleanupAfterCollection();
+    return collectedAny;
 }
 
 // Don't merge too many times in a row, and do at least a minimum
@@ -3184,7 +3185,9 @@ nsCycleCollector_collect(bool aManuallyTriggered,
         listener = new nsCycleCollectorLogger();
     }
 
-    data->mCollector->Collect(aManuallyTriggered ? ManualCC : ScheduledCC, aResults, listener);
+    nsAutoTArray<PtrInfo*, 4000> whiteNodes;
+    data->mCollector->Collect(aManuallyTriggered ? ManualCC : ScheduledCC,
+                              &whiteNodes, aResults, listener);
 }
 
 void