Bug 1342303 part 3 - Remove nsCOMArray::EnumerateForwards uses in docshell. r=smaug
MozReview-Commit-ID: FJen0p0c54u
--- a/docshell/shistory/nsSHEntry.cpp
+++ b/docshell/shistory/nsSHEntry.cpp
@@ -54,29 +54,24 @@ nsSHEntry::nsSHEntry(const nsSHEntry& aO
, mStateData(aOther.mStateData)
, mIsSrcdocEntry(aOther.mIsSrcdocEntry)
, mScrollRestorationIsManual(false)
, mSrcdocData(aOther.mSrcdocData)
, mBaseURI(aOther.mBaseURI)
{
}
-static bool
-ClearParentPtr(nsISHEntry* aEntry, void* /* aData */)
-{
- if (aEntry) {
- aEntry->SetParent(nullptr);
- }
- return true;
-}
-
nsSHEntry::~nsSHEntry()
{
// Null out the mParent pointers on all our kids.
- mChildren.EnumerateForwards(ClearParentPtr, nullptr);
+ for (nsISHEntry* entry : mChildren) {
+ if (entry) {
+ entry->SetParent(nullptr);
+ }
+ }
}
NS_IMPL_ISUPPORTS(nsSHEntry, nsISHContainer, nsISHEntry, nsISHEntryInternal)
NS_IMETHODIMP
nsSHEntry::SetScrollPosition(int32_t aX, int32_t aY)
{
mScrollPositionX = aX;