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

Update rust-selectors

Browse source 
Update for https://github.com/servo/rust-selectors/pull/37
This commit is contained in:
Simon Sapin 2015-07-17 18:18:39 +02:00
parent 0d7744b198
commit 055a1c5cee
18 changed files with 171 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

60
components/script/dom/node.rs
View file

@ -413,13 +413,14 @@ impl<'a> Iterator for QuerySelectorIterator {
let selectors = &self.selectors;
// TODO(cgaebel): Is it worth it to build a bloom filter here
// (instead of passing `None`)? Probably.
self.iterator.find(|node| {
if let Some(element) = ElementCast::to_ref(node.r()) {
matches(selectors, &element, &mut None)
} else {
false
self.iterator.by_ref().filter_map(|node| {
if let Some(element) = ElementCast::to_root(node) {
if matches(selectors, &element, None) {
return Some(NodeCast::from_root(element))
}
}
})
None
}).next()
}
}
@ -891,7 +892,7 @@ impl<'a> NodeHelpers for &'a Node {
let root = self.ancestors().last();
let root = root.r().unwrap_or(self.clone());
Ok(root.traverse_preorder().filter_map(ElementCast::to_root).find(|element| {
matches(selectors, &element.r(), &mut None)
matches(selectors, element, None)
}))
}
}
@ -2579,51 +2580,6 @@ impl<'a> VirtualMethods for &'a Node {
}
}
impl<'a> ::selectors::Node for &'a Node {
type Element = &'a Element;
fn parent_node(&self) -> Option<&'a Node> {
(*self).parent_node.get()
.map(|node| node.root().get_unsound_ref_forever())
}
fn first_child(&self) -> Option<&'a Node> {
(*self).first_child.get()
.map(|node| node.root().get_unsound_ref_forever())
}
fn last_child(&self) -> Option<&'a Node> {
(*self).last_child.get()
.map(|node| node.root().get_unsound_ref_forever())
}
fn prev_sibling(&self) -> Option<&'a Node> {
(*self).prev_sibling.get()
.map(|node| node.root().get_unsound_ref_forever())
}
fn next_sibling(&self) -> Option<&'a Node> {
(*self).next_sibling.get()
.map(|node| node.root().get_unsound_ref_forever())
}
fn is_document(&self) -> bool {
DocumentDerived::is_document(*self)
}
fn as_element(&self) -> Option<Self::Element> {
ElementCast::to_ref(*self)
}
fn is_element_or_non_empty_text(&self) -> bool {
if self.is_text() {
self.GetTextContent().map_or(false, |s| !s.is_empty())
} else {
self.is_element()
}
}
}
pub trait DisabledStateHelpers {
fn check_ancestors_disabled_state_for_form_control(self);
fn check_parent_disabled_state_for_option(self);