Backed out changeset e83481bd6963 (bug 1401379) for failing wpt-reftest /infrastructure/reftest-wait.html and unexpected passes in /webvtt/ and leaks in browser-chrome, all on OS X and Windows. r=backout on a CLOSED TREE

docshell/base/nsDocShell.cpp

@@ -952,15 +952,10 @@ nsDocShell::DestroyChildren()
   nsDocLoader::DestroyChildren();
 }
 
-NS_IMPL_CYCLE_COLLECTION_INHERITED(nsDocShell,
-                                   nsDocLoader,
-                                   mSessionStorageManager,
-                                   mScriptGlobal)
-
 NS_IMPL_ADDREF_INHERITED(nsDocShell, nsDocLoader)
 NS_IMPL_RELEASE_INHERITED(nsDocShell, nsDocLoader)
 
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDocShell)
+NS_INTERFACE_MAP_BEGIN(nsDocShell)
   NS_INTERFACE_MAP_ENTRY(nsIDocShell)
   NS_INTERFACE_MAP_ENTRY(nsIDocShellTreeItem)
   NS_INTERFACE_MAP_ENTRY(nsIWebNavigation)

docshell/base/nsDocShell.h

@@ -173,7 +173,6 @@ public:
   virtual nsresult Init() override;
 
   NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDocShell, nsDocLoader)
 
   NS_DECL_NSIDOCSHELL
   NS_DECL_NSIDOCSHELLTREEITEM

uriloader/base/nsDocLoader.cpp

@@ -165,13 +165,14 @@ nsDocLoader::~nsDocLoader()
          ("DocLoader:%p: deleted.\n", this));
 }
 
+
 /*
  * Implementation of ISupports methods...
  */
-NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDocLoader)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDocLoader)
+NS_IMPL_ADDREF(nsDocLoader)
+NS_IMPL_RELEASE(nsDocLoader)
 
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDocLoader)
+NS_INTERFACE_MAP_BEGIN(nsDocLoader)
    NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIRequestObserver)
    NS_INTERFACE_MAP_ENTRY(nsIRequestObserver)
    NS_INTERFACE_MAP_ENTRY(nsIDocumentLoader)
@@ -187,8 +188,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDocLoader)
    else
 NS_INTERFACE_MAP_END
 
-NS_IMPL_CYCLE_COLLECTION(nsDocLoader, mChildrenInOnload)
-
 
 /*
  * Implementation of nsIInterfaceRequestor methods...

uriloader/base/nsDocLoader.h

@@ -28,7 +28,6 @@
 #include "nsCOMPtr.h"
 #include "PLDHashTable.h"
 #include "nsAutoPtr.h"
-#include "nsCycleCollectionParticipant.h"
 
 #include "mozilla/LinkedList.h"
 
@@ -70,9 +69,7 @@ public:
     // Add aDocLoader as a child to the docloader service.
     static MOZ_MUST_USE nsresult AddDocLoaderAsChildOfRoot(nsDocLoader* aDocLoader);
 
-    NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-    NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsDocLoader, nsIDocumentLoader)
-
+    NS_DECL_ISUPPORTS
     NS_DECL_NSIDOCUMENTLOADER
 
     // nsIProgressEventSink