Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-22 16:18:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Look to base XBL bindings for content too. r=bholley

Browse source 
MozReview-Commit-ID: DFep2S6jnWf
This commit is contained in:
Cameron McCormack 2017-06-27 17:14:14 -07:00
parent 71f1f4b508
commit 84c61fa15e
1 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -373,10 +373,11 @@ impl<'a> Iterator for GeckoChildrenIterator<'a> {
} }
/// A Simple wrapper over a non-null Gecko `nsXBLBinding` pointer. /// A Simple wrapper over a non-null Gecko `nsXBLBinding` pointer.
#[derive(Clone, Copy)]
pub struct GeckoXBLBinding<'lb>(pub &'lb RawGeckoXBLBinding); pub struct GeckoXBLBinding<'lb>(pub &'lb RawGeckoXBLBinding);
impl<'lb> GeckoXBLBinding<'lb> { impl<'lb> GeckoXBLBinding<'lb> {
fn base_binding(&self) -> Option<GeckoXBLBinding> { fn base_binding(&self) -> Option<Self> {
unsafe { self.0.mNextBinding.mRawPtr.as_ref().map(GeckoXBLBinding) } unsafe { self.0.mNextBinding.mRawPtr.as_ref().map(GeckoXBLBinding) }
} }
@ -388,6 +389,21 @@ impl<'lb> GeckoXBLBinding<'lb> {
unsafe { bindings::Gecko_XBLBinding_InheritsStyle(self.0) } unsafe { bindings::Gecko_XBLBinding_InheritsStyle(self.0) }
} }
// This duplicates the logic in Gecko's
// nsBindingManager::GetBindingWithContent.
fn get_binding_with_content(&self) -> Option<Self> {
let mut binding = *self;
loop {
if !binding.anon_content().is_null() {
return Some(binding);
}
binding = match binding.base_binding() {
Some(b) => b,
None => return None,
};
}
}
// Implements Gecko's nsXBLBinding::WalkRules(). // Implements Gecko's nsXBLBinding::WalkRules().
fn get_declarations_for<E, V>(&self, fn get_declarations_for<E, V>(&self,
element: &E, element: &E,
@ -480,10 +496,25 @@ impl<'le> GeckoElement<'le> {
unsafe { slots.as_ref() } unsafe { slots.as_ref() }
} }
#[inline]
fn get_xbl_binding(&self) -> Option<GeckoXBLBinding> { fn get_xbl_binding(&self) -> Option<GeckoXBLBinding> {
if self.flags() & (structs::NODE_MAY_BE_IN_BINDING_MNGR as u32) == 0 {
return None;
}
unsafe { bindings::Gecko_GetXBLBinding(self.0).map(GeckoXBLBinding) } unsafe { bindings::Gecko_GetXBLBinding(self.0).map(GeckoXBLBinding) }
} }
#[inline]
fn get_xbl_binding_with_content(&self) -> Option<GeckoXBLBinding> {
self.get_xbl_binding().and_then(|b| b.get_binding_with_content())
}
#[inline]
fn has_xbl_binding_with_content(&self) -> bool {
!self.get_xbl_binding_with_content().is_none()
}
fn get_xbl_binding_parent(&self) -> Option<Self> { fn get_xbl_binding_parent(&self) -> Option<Self> {
unsafe { bindings::Gecko_GetBindingParent(self.0).map(GeckoElement) } unsafe { bindings::Gecko_GetBindingParent(self.0).map(GeckoElement) }
} }
@ -1061,16 +1092,9 @@ impl<'le> TElement for GeckoElement<'le> {
} }
fn xbl_binding_anonymous_content(&self) -> Option<GeckoNode<'le>> { fn xbl_binding_anonymous_content(&self) -> Option<GeckoNode<'le>> {
if self.flags() & (structs::NODE_MAY_BE_IN_BINDING_MNGR as u32) == 0 { self.get_xbl_binding_with_content()
return None; .map(|b| unsafe { b.anon_content().as_ref() }.unwrap())
} .map(GeckoNode::from_content)
let anon_content = match self.get_xbl_binding() {
Some(binding) => binding.anon_content(),
None => return None,
};
unsafe { anon_content.as_ref().map(GeckoNode::from_content) }
} }
fn get_css_transitions_info(&self) fn get_css_transitions_info(&self)