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

Backed out changeset fc813bf68348 for failing reftest layout/reftests/bugs/272646-1.xul on OS X. r=backout

Browse source 
Backs out https://github.com/servo/servo/pull/19045
This commit is contained in:
Gecko Backout 2017-10-28 08:08:47 +00:00 • committed by moz-servo-sync
parent 592c513c28
commit cda9d186c1
5 changed files with 47 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -518,14 +518,9 @@ impl<'le> GeckoElement<'le> {
.and_then(|s| unsafe { s.mExtendedSlots.mPtr.as_ref() })
}
#[inline]
fn may_be_in_binding_manager(&self) -> bool {
self.flags() & (structs::NODE_MAY_BE_IN_BINDING_MNGR as u32) != 0
}
#[inline]
fn get_xbl_binding(&self) -> Option<GeckoXBLBinding<'le>> {
if !self.may_be_in_binding_manager() {
if self.flags() & (structs::NODE_MAY_BE_IN_BINDING_MNGR as u32) == 0 {
return None;
}
@ -558,11 +553,9 @@ impl<'le> GeckoElement<'le> {
} else {
let binding_parent = unsafe {
self.get_non_xul_xbl_binding_parent_raw_content().as_ref()
}.map(GeckoNode::from_content).and_then(|n| n.as_element());
debug_assert!(binding_parent == unsafe {
bindings::Gecko_GetBindingParent(self.0).map(GeckoElement)
});
}.map(GeckoNode::from_content)
.and_then(|n| n.as_element());
debug_assert!(binding_parent == unsafe { bindings::Gecko_GetBindingParent(self.0).map(GeckoElement) });
binding_parent
}
}
@ -932,28 +925,6 @@ impl<'le> TElement for GeckoElement<'le> {
self.get_before_or_after_pseudo(/* is_before = */ false)
}
/// Ensure this accurately represents the rules that an element may ever
/// match, even in the native anonymous content case.
fn style_scope(&self) -> Self::ConcreteNode {
if self.implemented_pseudo_element().is_some() {
return self.closest_non_native_anonymous_ancestor().unwrap().style_scope();
}
if self.is_in_native_anonymous_subtree() {
return self.as_node().owner_doc().as_node();
}
if self.get_xbl_binding().is_some() {
return self.as_node();
}
if let Some(parent) = self.get_xbl_binding_parent() {
return parent.as_node();
}
self.as_node().owner_doc().as_node()
}
/// Execute `f` for each anonymous content child element (apart from
/// ::before and ::after) whose originating element is `self`.
fn each_anonymous_content_child<F>(&self, mut f: F)