Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-09 06:22:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 4249adc2593a (bug 1401379)

Browse Source
This commit is contained in:
Sebastian Hengst 2017-10-02 19:57:27 +02:00
parent 980f5ad6ad
commit 3c456e1e9b
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/base/nsGlobalWindow.cpp
View File

@ -2344,8 +2344,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsGlobalWindow)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMozSelfSupport)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mIntlUtils)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDocShell)
tmp->TraverseHostObjectURIs(cb);
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mChromeFields.mBrowserDOMWindow)
@ -2429,8 +2427,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsGlobalWindow)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mMozSelfSupport)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mIntlUtils)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mDocShell)
tmp->UnlinkHostObjectURIs();
NS_IMPL_CYCLE_COLLECTION_UNLINK(mIdleRequestExecutor)

8
dom/base/nsPIDOMWindow.h
View File

@ -638,10 +638,10 @@ protected:
// These members are only used on outer windows.
nsCOMPtr<mozilla::dom::Element> mFrameElement;
// This reference is used by nsGlobalWindow.
// nsIDocShell* mDocShell;
nsCOMPtr<nsIDocShell> mDocShell;
// This reference is used by the subclass nsGlobalWindow, and cleared in it's
// DetachFromDocShell() method. This method is called by nsDocShell::Destroy(),
// which is called before the nsDocShell is destroyed.
nsIDocShell* MOZ_NON_OWNING_REF mDocShell; // Weak Reference
// mPerformance is only used on inner windows.
RefPtr<mozilla::dom::Performance> mPerformance;