Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 603804d62ce8 (bug 1463116) for force-cargo-library-build bustage on a CLOSED TREE

Browse Source
This commit is contained in:
shindli 2018-05-21 23:55:58 +03:00
parent 622b10843f
commit 83d239ac83
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/base/FragmentOrElement.cpp
View File

@ -645,7 +645,6 @@ static_assert(sizeof(FragmentOrElement::nsDOMSlots) <= MaxDOMSlotSizeAllowed,
void
nsIContent::nsExtendedContentSlots::Unlink()
{
mBindingParent = nullptr;
mXBLInsertionPoint = nullptr;
mContainingShadow = nullptr;
mAssignedSlot = nullptr;
@ -654,9 +653,6 @@ nsIContent::nsExtendedContentSlots::Unlink()
void
nsIContent::nsExtendedContentSlots::Traverse(nsCycleCollectionTraversalCallback& aCb)
{
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(aCb, "mExtendedSlots->mBindingParent");
aCb.NoteXPCOMChild(NS_ISUPPORTS_CAST(nsIContent*, mBindingParent));
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(aCb, "mExtendedSlots->mContainingShadow");
aCb.NoteXPCOMChild(NS_ISUPPORTS_CAST(nsIContent*, mContainingShadow));
@ -668,6 +664,7 @@ nsIContent::nsExtendedContentSlots::Traverse(nsCycleCollectionTraversalCallback&
}
nsIContent::nsExtendedContentSlots::nsExtendedContentSlots()
: mBindingParent(nullptr)
{
}
@ -739,9 +736,8 @@ FragmentOrElement::nsDOMSlots::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) c
// - mChildrenList
// - mClassList
// The following member are not measured:
// - mControllers: because it is non-owning
// - mBindingParent: because it is some ancestor element.
// The following members are not measured:
// - mBindingParent / mControllers: because they're non-owning
return n;
}

4
dom/base/nsIContent.h
View File

@ -451,7 +451,7 @@ public:
virtual nsIContent* GetBindingParent() const
{
const nsExtendedContentSlots* slots = GetExistingExtendedContentSlots();
return slots ? slots->mBindingParent.get() : nullptr;
return slots ? slots->mBindingParent : nullptr;
}
/**
@ -808,7 +808,7 @@ protected:
*
* @see nsIContent::GetBindingParent
*/
nsCOMPtr<nsIContent> mBindingParent;
nsIContent* mBindingParent; // [Weak]
/**
* @see nsIContent::GetXBLInsertionPoint

2
dom/xul/nsXULElement.cpp
View File

@ -304,14 +304,12 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULElement)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXULElement,
nsStyledElement)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBindingParent);
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsXULElement,
nsStyledElement)
// Why aren't we unlinking the prototype?
tmp->ClearHasID();
NS_IMPL_CYCLE_COLLECTION_UNLINK(mBindingParent);
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_IMPL_ADDREF_INHERITED(nsXULElement, nsStyledElement)

4
dom/xul/nsXULElement.h
View File

@ -670,9 +670,9 @@ protected:
/**
* The nearest enclosing content node with a binding
* that created us.
* that created us. [Weak]
*/
nsCOMPtr<nsIContent> mBindingParent;
nsIContent* mBindingParent;
/**
* Abandon our prototype linkage, and copy all attributes locally

2
servo/components/style/gecko/wrapper.rs
View File

@ -665,7 +665,7 @@ impl<'le> GeckoElement<'le> {
fn non_xul_xbl_binding_parent_raw_content(&self) -> *mut nsIContent {
debug_assert!(!self.is_xul_element());
self.extended_slots()
.map_or(ptr::null_mut(), |slots| slots._base.mBindingParent.raw())
.map_or(ptr::null_mut(), |slots| slots._base.mBindingParent)
}
#[inline]