Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-08 07:53:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #19663 - moz-servo-sync:gecko-backout, r=moz-servo-sync

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

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

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19663)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-12-30 19:34:03 -06:00 • committed by GitHub
commit 0af7ac6a4a
2 changed files with 72 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

165
components/style/gecko/generated/structs.rs
View file

File diff suppressed because one or more lines are too long

7
components/style/gecko/wrapper.rs
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 {