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

style: Stop duplicating slots.

Browse source 
Bug: 1427001
Reviewed-by: smaug
MozReview-Commit-ID: Cq647BcOzbe
This commit is contained in:
Emilio Cobos Álvarez 2017-12-23 09:23:42 +01:00
parent 0af7ac6a4a
commit dd1cef1a6c
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/style/gecko/wrapper.rs
View file

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