Bug 1401379 - Part 1: Make nsDocShell and nsDocLoader cycle collected, r=smaug

MozReview-Commit-ID: Bui924n8Kvn
2017-10-02 10:58:39 -04:00
parent 73909d0493
commit 5e91cc36b5
4 changed files with 16 additions and 6 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -952,10 +952,15 @@ 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(nsDocShell)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDocShell)
  NS_INTERFACE_MAP_ENTRY(nsIDocShell)
  NS_INTERFACE_MAP_ENTRY(nsIDocShellTreeItem)
  NS_INTERFACE_MAP_ENTRY(nsIWebNavigation)