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

Convert the NodeHelpers trait to use self methods

Browse source
This commit is contained in:
Cameron Zwarich 2014-09-30 23:41:48 -07:00
parent 09e9abc047
commit 78791af7d6
1 changed files with 94 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -365,73 +365,73 @@ impl<'a> PrivateNodeHelpers for JSRef<'a, Node> {
} }
pub trait NodeHelpers<'m, 'n> { pub trait NodeHelpers<'m, 'n> {
fn ancestors(&self) -> AncestorIterator<'n>; fn ancestors(self) -> AncestorIterator<'n>;
fn children(&self) -> AbstractNodeChildrenIterator<'n>; fn children(self) -> AbstractNodeChildrenIterator<'n>;
fn child_elements(&self) -> ChildElementIterator<'m, 'n>; fn child_elements(self) -> ChildElementIterator<'m, 'n>;
fn following_siblings(&self) -> AbstractNodeChildrenIterator<'n>; fn following_siblings(self) -> AbstractNodeChildrenIterator<'n>;
fn is_in_doc(&self) -> bool; fn is_in_doc(self) -> bool;
fn is_inclusive_ancestor_of(&self, parent: JSRef<Node>) -> bool; fn is_inclusive_ancestor_of(self, parent: JSRef<Node>) -> bool;
fn is_parent_of(&self, child: JSRef<Node>) -> bool; fn is_parent_of(self, child: JSRef<Node>) -> bool;
fn type_id(&self) -> NodeTypeId; fn type_id(self) -> NodeTypeId;
fn parent_node(&self) -> Option<Temporary<Node>>; fn parent_node(self) -> Option<Temporary<Node>>;
fn first_child(&self) -> Option<Temporary<Node>>; fn first_child(self) -> Option<Temporary<Node>>;
fn last_child(&self) -> Option<Temporary<Node>>; fn last_child(self) -> Option<Temporary<Node>>;
fn prev_sibling(&self) -> Option<Temporary<Node>>; fn prev_sibling(self) -> Option<Temporary<Node>>;
fn next_sibling(&self) -> Option<Temporary<Node>>; fn next_sibling(self) -> Option<Temporary<Node>>;
fn owner_doc(&self) -> Temporary<Document>; fn owner_doc(self) -> Temporary<Document>;
fn set_owner_doc(&self, document: JSRef<Document>); fn set_owner_doc(self, document: JSRef<Document>);
fn is_in_html_doc(&self) -> bool; fn is_in_html_doc(self) -> bool;
fn wait_until_safe_to_modify_dom(&self); fn wait_until_safe_to_modify_dom(self);
fn is_element(&self) -> bool; fn is_element(self) -> bool;
fn is_document(&self) -> bool; fn is_document(self) -> bool;
fn is_doctype(&self) -> bool; fn is_doctype(self) -> bool;
fn is_text(&self) -> bool; fn is_text(self) -> bool;
fn is_anchor_element(&self) -> bool; fn is_anchor_element(self) -> bool;
fn get_hover_state(&self) -> bool; fn get_hover_state(self) -> bool;
fn set_hover_state(&self, state: bool); fn set_hover_state(self, state: bool);
fn get_disabled_state(&self) -> bool; fn get_disabled_state(self) -> bool;
fn set_disabled_state(&self, state: bool); fn set_disabled_state(self, state: bool);
fn get_enabled_state(&self) -> bool; fn get_enabled_state(self) -> bool;
fn set_enabled_state(&self, state: bool); fn set_enabled_state(self, state: bool);
fn dump(&self); fn dump(self);
fn dump_indent(&self, indent: uint); fn dump_indent(self, indent: uint);
fn debug_str(&self) -> String; fn debug_str(self) -> String;
fn traverse_preorder(&self) -> TreeIterator<'n>; fn traverse_preorder(self) -> TreeIterator<'n>;
fn sequential_traverse_postorder(&self) -> TreeIterator<'n>; fn sequential_traverse_postorder(self) -> TreeIterator<'n>;
fn inclusively_following_siblings(&self) -> AbstractNodeChildrenIterator<'n>; fn inclusively_following_siblings(self) -> AbstractNodeChildrenIterator<'n>;
fn to_trusted_node_address(&self) -> TrustedNodeAddress; fn to_trusted_node_address(self) -> TrustedNodeAddress;
fn get_bounding_content_box(&self) -> Rect<Au>; fn get_bounding_content_box(self) -> Rect<Au>;
fn get_content_boxes(&self) -> Vec<Rect<Au>>; fn get_content_boxes(self) -> Vec<Rect<Au>>;
fn query_selector(&self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>>; fn query_selector(self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>>;
fn query_selector_all(&self, selectors: DOMString) -> Fallible<Temporary<NodeList>>; fn query_selector_all(self, selectors: DOMString) -> Fallible<Temporary<NodeList>>;
fn remove_self(&self); fn remove_self(self);
fn get_unique_id(&self) -> String; fn get_unique_id(self) -> String;
fn summarize(&self) -> NodeInfo; fn summarize(self) -> NodeInfo;
} }
impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> { impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
/// Dumps the subtree rooted at this node, for debugging. /// Dumps the subtree rooted at this node, for debugging.
fn dump(&self) { fn dump(self) {
self.dump_indent(0); self.dump_indent(0);
} }
/// Dumps the node tree, for debugging, with indentation. /// Dumps the node tree, for debugging, with indentation.
fn dump_indent(&self, indent: uint) { fn dump_indent(self, indent: uint) {
let mut s = String::new(); let mut s = String::new();
for _ in range(0, indent) { for _ in range(0, indent) {
s.push_str(" "); s.push_str(" ");
@ -447,43 +447,43 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
} }
/// Returns a string that describes this node. /// Returns a string that describes this node.
fn debug_str(&self) -> String { fn debug_str(self) -> String {
format!("{:?}", self.type_id) format!("{:?}", self.type_id)
} }
fn is_in_doc(&self) -> bool { fn is_in_doc(self) -> bool {
self.deref().flags.deref().borrow().contains(IsInDoc) self.deref().flags.deref().borrow().contains(IsInDoc)
} }
/// Returns the type ID of this node. Fails if this node is borrowed mutably. /// Returns the type ID of this node. Fails if this node is borrowed mutably.
fn type_id(&self) -> NodeTypeId { fn type_id(self) -> NodeTypeId {
self.deref().type_id self.deref().type_id
} }
fn parent_node(&self) -> Option<Temporary<Node>> { fn parent_node(self) -> Option<Temporary<Node>> {
self.deref().parent_node.get().map(|node| Temporary::new(node)) self.deref().parent_node.get().map(|node| Temporary::new(node))
} }
fn first_child(&self) -> Option<Temporary<Node>> { fn first_child(self) -> Option<Temporary<Node>> {
self.deref().first_child.get().map(|node| Temporary::new(node)) self.deref().first_child.get().map(|node| Temporary::new(node))
} }
fn last_child(&self) -> Option<Temporary<Node>> { fn last_child(self) -> Option<Temporary<Node>> {
self.deref().last_child.get().map(|node| Temporary::new(node)) self.deref().last_child.get().map(|node| Temporary::new(node))
} }
/// Returns the previous sibling of this node. Fails if this node is borrowed mutably. /// Returns the previous sibling of this node. Fails if this node is borrowed mutably.
fn prev_sibling(&self) -> Option<Temporary<Node>> { fn prev_sibling(self) -> Option<Temporary<Node>> {
self.deref().prev_sibling.get().map(|node| Temporary::new(node)) self.deref().prev_sibling.get().map(|node| Temporary::new(node))
} }
/// Returns the next sibling of this node. Fails if this node is borrowed mutably. /// Returns the next sibling of this node. Fails if this node is borrowed mutably.
fn next_sibling(&self) -> Option<Temporary<Node>> { fn next_sibling(self) -> Option<Temporary<Node>> {
self.deref().next_sibling.get().map(|node| Temporary::new(node)) self.deref().next_sibling.get().map(|node| Temporary::new(node))
} }
#[inline] #[inline]
fn is_element(&self) -> bool { fn is_element(self) -> bool {
match self.type_id { match self.type_id {
ElementNodeTypeId(..) => true, ElementNodeTypeId(..) => true,
_ => false _ => false
@ -491,30 +491,30 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
} }
#[inline] #[inline]
fn is_document(&self) -> bool { fn is_document(self) -> bool {
self.type_id == DocumentNodeTypeId self.type_id == DocumentNodeTypeId
} }
#[inline] #[inline]
fn is_anchor_element(&self) -> bool { fn is_anchor_element(self) -> bool {
self.type_id == ElementNodeTypeId(HTMLAnchorElementTypeId) self.type_id == ElementNodeTypeId(HTMLAnchorElementTypeId)
} }
#[inline] #[inline]
fn is_doctype(&self) -> bool { fn is_doctype(self) -> bool {
self.type_id == DoctypeNodeTypeId self.type_id == DoctypeNodeTypeId
} }
#[inline] #[inline]
fn is_text(&self) -> bool { fn is_text(self) -> bool {
self.type_id == TextNodeTypeId self.type_id == TextNodeTypeId
} }
fn get_hover_state(&self) -> bool { fn get_hover_state(self) -> bool {
self.flags.deref().borrow().contains(InHoverState) self.flags.deref().borrow().contains(InHoverState)
} }
fn set_hover_state(&self, state: bool) { fn set_hover_state(self, state: bool) {
if state { if state {
self.flags.deref().borrow_mut().insert(InHoverState); self.flags.deref().borrow_mut().insert(InHoverState);
} else { } else {
@ -522,11 +522,11 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
} }
} }
fn get_disabled_state(&self) -> bool { fn get_disabled_state(self) -> bool {
self.flags.deref().borrow().contains(InDisabledState) self.flags.deref().borrow().contains(InDisabledState)
} }
fn set_disabled_state(&self, state: bool) { fn set_disabled_state(self, state: bool) {
if state { if state {
self.flags.deref().borrow_mut().insert(InDisabledState); self.flags.deref().borrow_mut().insert(InDisabledState);
} else { } else {
@ -534,11 +534,11 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
} }
} }
fn get_enabled_state(&self) -> bool { fn get_enabled_state(self) -> bool {
self.flags.deref().borrow().contains(InEnabledState) self.flags.deref().borrow().contains(InEnabledState)
} }
fn set_enabled_state(&self, state: bool) { fn set_enabled_state(self, state: bool) {
if state { if state {
self.flags.deref().borrow_mut().insert(InEnabledState); self.flags.deref().borrow_mut().insert(InEnabledState);
} else { } else {
@ -547,48 +547,48 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
} }
/// Iterates over this node and all its descendants, in preorder. /// Iterates over this node and all its descendants, in preorder.
fn traverse_preorder(&self) -> TreeIterator<'n> { fn traverse_preorder(self) -> TreeIterator<'n> {
let mut nodes = vec!(); let mut nodes = vec!();
gather_abstract_nodes(*self, &mut nodes, false); gather_abstract_nodes(self, &mut nodes, false);
TreeIterator::new(nodes) TreeIterator::new(nodes)
} }
/// Iterates over this node and all its descendants, in postorder. /// Iterates over this node and all its descendants, in postorder.
fn sequential_traverse_postorder(&self) -> TreeIterator<'n> { fn sequential_traverse_postorder(self) -> TreeIterator<'n> {
let mut nodes = vec!(); let mut nodes = vec!();
gather_abstract_nodes(*self, &mut nodes, true); gather_abstract_nodes(self, &mut nodes, true);
TreeIterator::new(nodes) TreeIterator::new(nodes)
} }
fn inclusively_following_siblings(&self) -> AbstractNodeChildrenIterator<'n> { fn inclusively_following_siblings(self) -> AbstractNodeChildrenIterator<'n> {
AbstractNodeChildrenIterator { AbstractNodeChildrenIterator {
current_node: Some(self.clone()), current_node: Some(self.clone()),
} }
} }
fn is_inclusive_ancestor_of(&self, parent: JSRef<Node>) -> bool { fn is_inclusive_ancestor_of(self, parent: JSRef<Node>) -> bool {
*self == parent || parent.ancestors().any(|ancestor| &ancestor == self) self == parent || parent.ancestors().any(|ancestor| ancestor == self)
} }
fn following_siblings(&self) -> AbstractNodeChildrenIterator<'n> { fn following_siblings(self) -> AbstractNodeChildrenIterator<'n> {
AbstractNodeChildrenIterator { AbstractNodeChildrenIterator {
current_node: self.next_sibling().root().map(|next| next.deref().clone()), current_node: self.next_sibling().root().map(|next| next.deref().clone()),
} }
} }
fn is_parent_of(&self, child: JSRef<Node>) -> bool { fn is_parent_of(self, child: JSRef<Node>) -> bool {
match child.parent_node() { match child.parent_node() {
Some(parent) if parent == Temporary::from_rooted(*self) => true, Some(parent) if parent == Temporary::from_rooted(self) => true,
_ => false _ => false
} }
} }
fn to_trusted_node_address(&self) -> TrustedNodeAddress { fn to_trusted_node_address(self) -> TrustedNodeAddress {
TrustedNodeAddress(self.deref() as *const Node as *const libc::c_void) TrustedNodeAddress(self.deref() as *const Node as *const libc::c_void)
} }
fn get_bounding_content_box(&self) -> Rect<Au> { fn get_bounding_content_box(self) -> Rect<Au> {
let window = window_from_node(*self).root(); let window = window_from_node(self).root();
let page = window.deref().page(); let page = window.deref().page();
let addr = self.to_trusted_node_address(); let addr = self.to_trusted_node_address();
@ -596,8 +596,8 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
rect rect
} }
fn get_content_boxes(&self) -> Vec<Rect<Au>> { fn get_content_boxes(self) -> Vec<Rect<Au>> {
let window = window_from_node(*self).root(); let window = window_from_node(self).root();
let page = window.deref().page(); let page = window.deref().page();
let addr = self.to_trusted_node_address(); let addr = self.to_trusted_node_address();
let ContentBoxesResponse(rects) = page.layout().content_boxes(addr); let ContentBoxesResponse(rects) = page.layout().content_boxes(addr);
@ -605,7 +605,7 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
} }
// http://dom.spec.whatwg.org/#dom-parentnode-queryselector // http://dom.spec.whatwg.org/#dom-parentnode-queryselector
fn query_selector(&self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>> { fn query_selector(self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>> {
// Step 1. // Step 1.
match parse_selector_list_from_str(selectors.as_slice()) { match parse_selector_list_from_str(selectors.as_slice()) {
// Step 2. // Step 2.
@ -625,7 +625,7 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
} }
// http://dom.spec.whatwg.org/#dom-parentnode-queryselectorall // http://dom.spec.whatwg.org/#dom-parentnode-queryselectorall
fn query_selector_all(&self, selectors: DOMString) -> Fallible<Temporary<NodeList>> { fn query_selector_all(self, selectors: DOMString) -> Fallible<Temporary<NodeList>> {
// Step 1. // Step 1.
let nodes; let nodes;
let root = self.ancestors().last().unwrap_or(self.clone()); let root = self.ancestors().last().unwrap_or(self.clone());
@ -640,35 +640,35 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
|node| node.is_element() && matches(selectors, node, &mut None)).collect() |node| node.is_element() && matches(selectors, node, &mut None)).collect()
} }
} }
let window = window_from_node(*self).root(); let window = window_from_node(self).root();
Ok(NodeList::new_simple_list(*window, nodes)) Ok(NodeList::new_simple_list(*window, nodes))
} }
fn ancestors(&self) -> AncestorIterator<'n> { fn ancestors(self) -> AncestorIterator<'n> {
AncestorIterator { AncestorIterator {
current: self.parent_node.get().map(|node| (*node.root()).clone()), current: self.parent_node.get().map(|node| (*node.root()).clone()),
} }
} }
fn owner_doc(&self) -> Temporary<Document> { fn owner_doc(self) -> Temporary<Document> {
Temporary::new(self.owner_doc.get().as_ref().unwrap().clone()) Temporary::new(self.owner_doc.get().as_ref().unwrap().clone())
} }
fn set_owner_doc(&self, document: JSRef<Document>) { fn set_owner_doc(self, document: JSRef<Document>) {
self.owner_doc.assign(Some(document.clone())); self.owner_doc.assign(Some(document.clone()));
} }
fn is_in_html_doc(&self) -> bool { fn is_in_html_doc(self) -> bool {
self.owner_doc().root().is_html_document self.owner_doc().root().is_html_document
} }
fn children(&self) -> AbstractNodeChildrenIterator<'n> { fn children(self) -> AbstractNodeChildrenIterator<'n> {
AbstractNodeChildrenIterator { AbstractNodeChildrenIterator {
current_node: self.first_child.get().map(|node| (*node.root()).clone()), current_node: self.first_child.get().map(|node| (*node.root()).clone()),
} }
} }
fn child_elements(&self) -> ChildElementIterator<'m, 'n> { fn child_elements(self) -> ChildElementIterator<'m, 'n> {
self.children() self.children()
.filter(|node| { .filter(|node| {
node.is_element() node.is_element()
@ -679,23 +679,23 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
}) })
} }
fn wait_until_safe_to_modify_dom(&self) { fn wait_until_safe_to_modify_dom(self) {
let document = self.owner_doc().root(); let document = self.owner_doc().root();
document.deref().wait_until_safe_to_modify_dom(); document.deref().wait_until_safe_to_modify_dom();
} }
fn remove_self(&self) { fn remove_self(self) {
match self.parent_node().root() { match self.parent_node().root() {
Some(parent) => parent.remove_child(*self), Some(parent) => parent.remove_child(self),
None => () None => ()
} }
} }
fn get_unique_id(&self) -> String { fn get_unique_id(self) -> String {
self.unique_id.borrow().clone() self.unique_id.borrow().clone()
} }
fn summarize(&self) -> NodeInfo { fn summarize(self) -> NodeInfo {
if self.unique_id.borrow().is_empty() { if self.unique_id.borrow().is_empty() {
let mut unique_id = self.unique_id.borrow_mut(); let mut unique_id = self.unique_id.borrow_mut();
*unique_id = uuid::Uuid::new_v4().to_simple_string(); *unique_id = uuid::Uuid::new_v4().to_simple_string();
@ -716,7 +716,7 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
systemId: "".to_string(), systemId: "".to_string(),
attrs: if self.is_element() { attrs: if self.is_element() {
let elem: JSRef<Element> = ElementCast::to_ref(*self).unwrap(); let elem: JSRef<Element> = ElementCast::to_ref(self).unwrap();
elem.summarize() elem.summarize()
} else { } else {
vec!() vec!()
@ -725,7 +725,7 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
isDocumentElement: isDocumentElement:
self.owner_doc().root() self.owner_doc().root()
.GetDocumentElement() .GetDocumentElement()
.map(|elem| NodeCast::from_ref(*elem.root()) == *self) .map(|elem| NodeCast::from_ref(*elem.root()) == self)
.unwrap_or(false), .unwrap_or(false),
shortValue: self.GetNodeValue().unwrap_or("".to_string()), //FIXME: truncate shortValue: self.GetNodeValue().unwrap_or("".to_string()), //FIXME: truncate