Backed out changeset dda1c7951937 for build bustage force-cargo-library-build. r=backout on a CLOSED TREE

Backs out https://github.com/servo/servo/pull/19660
This commit is contained in:
Gecko Backout 2017-12-31 01:17:32 +00:00 committed by moz-servo-sync
parent d3f603ecba
commit cf8b8db87d
2 changed files with 72 additions and 100 deletions

File diff suppressed because one or more lines are too long

View file

@ -536,9 +536,8 @@ impl<'le> GeckoElement<'le> {
fn get_extended_slots(
&self,
) -> Option<&structs::FragmentOrElement_nsExtendedDOMSlots> {
self.get_dom_slots().and_then(|s| unsafe {
(s._base.mExtendedSlots.mPtr as *const structs::FragmentOrElement_nsExtendedDOMSlots).as_ref()
})
self.get_dom_slots()
.and_then(|s| unsafe { s.mExtendedSlots.mPtr.as_ref() })
}
#[inline]
@ -593,7 +592,7 @@ impl<'le> GeckoElement<'le> {
fn get_non_xul_xbl_binding_parent_raw_content(&self) -> *mut nsIContent {
debug_assert!(!self.is_xul_element());
self.get_extended_slots()
.map_or(ptr::null_mut(), |slots| slots._base.mBindingParent)
.map_or(ptr::null_mut(), |slots| slots.mBindingParent)
}
fn has_xbl_binding_parent(&self) -> bool {