Bug 1544002 - nsNavHistoryResult::mRefreshParticipants should participate in cycle collection. r=mak
authorAndrew McCreight <continuation@gmail.com>
Mon, 15 Apr 2019 10:11:38 +0000
changeset 469510 b7402a73e252b096234bf3814b5a75bbc0258f94
parent 469509 04185cfeb1ae23cec53a2dadc7d6490022989cda
child 469511 9573e2163ca4009956027b6f2936871d8bb67586
push id83183
push useramccreight@mozilla.com
push dateMon, 15 Apr 2019 14:09:43 +0000
treeherderautoland@b7402a73e252 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1544002
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1544002 - nsNavHistoryResult::mRefreshParticipants should participate in cycle collection. r=mak It is an array of cycle collected objects. Differential Revision: https://phabricator.services.mozilla.com/D27337
toolkit/components/places/nsNavHistoryResult.cpp
--- a/toolkit/components/places/nsNavHistoryResult.cpp
+++ b/toolkit/components/places/nsNavHistoryResult.cpp
@@ -3468,16 +3468,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(ns
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mObservers)
   for (auto it = tmp->mBookmarkFolderObservers.Iter(); !it.Done(); it.Next()) {
     delete it.Data();
     it.Remove();
   }
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mMobilePrefObservers)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mAllBookmarksObservers)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mHistoryObservers)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mRefreshParticipants)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsNavHistoryResult)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mRootNode)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mObservers)
   for (auto it = tmp->mBookmarkFolderObservers.Iter(); !it.Done(); it.Next()) {
     nsNavHistoryResult::FolderObserverList*& list = it.Data();
     for (uint32_t i = 0; i < list->Length(); ++i) {
@@ -3485,16 +3486,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(
                                          "mBookmarkFolderObservers value[i]");
       nsNavHistoryResultNode* node = list->ElementAt(i);
       cb.NoteXPCOMChild(node);
     }
   }
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMobilePrefObservers)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAllBookmarksObservers)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mHistoryObservers)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mRefreshParticipants)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(nsNavHistoryResult)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(nsNavHistoryResult)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsNavHistoryResult)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsINavHistoryResult)
   NS_INTERFACE_MAP_STATIC_AMBIGUOUS(nsNavHistoryResult)