aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/node.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2015-06-18 01:04:20 +0200
committerSimon Sapin <simon.sapin@exyr.org>2015-06-20 07:05:43 +0200
commitfc25397c91538eb2bd263170feb79cc97fcfd4de (patch)
treeec43c9d03e01a3634c089c3e9eaa37a7da0eaa40 /components/script/dom/node.rs
parent72ead882c08fbd66d59457efd1ebf86ee4ee97f2 (diff)
downloadservo-fc25397c91538eb2bd263170feb79cc97fcfd4de.tar.gz
servo-fc25397c91538eb2bd263170feb79cc97fcfd4de.zip
Update rust-selectors
https://github.com/servo/rust-selectors/pull/30
Diffstat (limited to 'components/script/dom/node.rs')
-rw-r--r--components/script/dom/node.rs44
1 files changed, 14 insertions, 30 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 9e2c56c8d22..851140e3929 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -2492,59 +2492,59 @@ impl<'a> VirtualMethods for &'a Node {
}
}
-impl<'a> style::node::TNode<'a> for &'a Node {
+impl<'a> style::node::TNode for &'a Node {
type Element = &'a Element;
- fn parent_node(self) -> Option<&'a Node> {
+ 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> {
+ 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> {
+ 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> {
+ 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> {
+ fn next_sibling(&self) -> Option<&'a Node> {
(*self).next_sibling.get()
.map(|node| node.root().get_unsound_ref_forever())
}
- fn is_document(self) -> bool {
+ fn is_document(&self) -> bool {
// FIXME(zwarich): Remove this when UFCS lands and there is a better way
// of disambiguating methods.
fn is_document<'a, T: DocumentDerived>(this: &T) -> bool {
this.is_document()
}
- is_document(self)
+ is_document(*self)
}
- fn is_element(self) -> bool {
+ fn is_element(&self) -> bool {
// FIXME(zwarich): Remove this when UFCS lands and there is a better way
// of disambiguating methods.
fn is_element<'a, T: ElementDerived>(this: &T) -> bool {
this.is_element()
}
- is_element(self)
+ is_element(*self)
}
- fn as_element(self) -> &'a Element {
- ElementCast::to_ref(self).unwrap()
+ fn as_element(&self) -> &'a Element {
+ ElementCast::to_ref(*self).unwrap()
}
- fn match_attr<F>(self, attr: &AttrSelector, test: F) -> bool
+ fn match_attr<F>(&self, attr: &AttrSelector, test: F) -> bool
where F: Fn(&str) -> bool
{
let local_name = {
@@ -2577,25 +2577,9 @@ impl<'a> style::node::TNode<'a> for &'a Node {
}
}
- fn is_html_element_in_html_document(self) -> bool {
+ fn is_html_element_in_html_document(&self) -> bool {
self.as_element().html_element_in_html_document()
}
-
- fn has_changed(self) -> bool { self.get_has_changed() }
- #[allow(unsafe_code)]
- unsafe fn set_changed(self, value: bool) { self.set_has_changed(value) }
-
- fn is_dirty(self) -> bool { self.get_is_dirty() }
- #[allow(unsafe_code)]
- unsafe fn set_dirty(self, value: bool) { self.set_is_dirty(value) }
-
- fn has_dirty_siblings(self) -> bool { self.get_has_dirty_siblings() }
- #[allow(unsafe_code)]
- unsafe fn set_dirty_siblings(self, value: bool) { self.set_has_dirty_siblings(value) }
-
- fn has_dirty_descendants(self) -> bool { self.get_has_dirty_descendants() }
- #[allow(unsafe_code)]
- unsafe fn set_dirty_descendants(self, value: bool) { self.set_has_dirty_descendants(value) }
}
pub trait DisabledStateHelpers {