diff options
Diffstat (limited to 'components/script/dom/node.rs')
| -rw-r--r-- | components/script/dom/node.rs | 119 |
1 files changed, 60 insertions, 59 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index b0cfbde774a..a47c7617066 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -283,8 +283,8 @@ impl<'a> PrivateNodeHelpers for JSRef<'a, Node> { } let parent = self.parent_node().root(); - parent.map(|parent| vtable_for(&*parent).child_inserted(self)); - document.content_and_heritage_changed(self, NodeDamage::OtherNodeDamage); + parent.map(|parent| vtable_for(&parent.r()).child_inserted(self)); + document.r().content_and_heritage_changed(self, NodeDamage::OtherNodeDamage); } // http://dom.spec.whatwg.org/#node-is-removed @@ -308,15 +308,15 @@ impl<'a> PrivateNodeHelpers for JSRef<'a, Node> { assert!(new_child.next_sibling().is_none()); match before { Some(ref before) => { - assert!(before.parent_node().root().root_ref() == Some(self)); + assert!(before.parent_node().root().r() == Some(self)); match before.prev_sibling().root() { None => { - assert!(Some(*before) == self.first_child().root().root_ref()); + assert!(Some(*before) == self.first_child().root().r()); self.first_child.assign(Some(new_child)); }, Some(prev_sibling) => { - prev_sibling.next_sibling.assign(Some(new_child)); - new_child.prev_sibling.assign(Some(*prev_sibling)); + prev_sibling.r().next_sibling.assign(Some(new_child)); + new_child.prev_sibling.assign(Some(prev_sibling.r())); }, } before.prev_sibling.assign(Some(new_child)); @@ -326,9 +326,9 @@ impl<'a> PrivateNodeHelpers for JSRef<'a, Node> { match self.last_child().root() { None => self.first_child.assign(Some(new_child)), Some(last_child) => { - assert!(last_child.next_sibling().is_none()); - last_child.next_sibling.assign(Some(new_child)); - new_child.prev_sibling.assign(Some(*last_child)); + assert!(last_child.r().next_sibling().is_none()); + last_child.r().next_sibling.assign(Some(new_child)); + new_child.prev_sibling.assign(Some(last_child.r())); } } @@ -343,14 +343,14 @@ impl<'a> PrivateNodeHelpers for JSRef<'a, Node> { /// /// Fails unless `child` is a child of this node. fn remove_child(self, child: JSRef<Node>) { - assert!(child.parent_node().root().root_ref() == Some(self)); + assert!(child.parent_node().root().r() == Some(self)); match child.prev_sibling.get().root() { None => { self.first_child.assign(child.next_sibling.get()); } Some(prev_sibling) => { - prev_sibling.next_sibling.assign(child.next_sibling.get()); + prev_sibling.r().next_sibling.assign(child.next_sibling.get()); } } @@ -359,7 +359,7 @@ impl<'a> PrivateNodeHelpers for JSRef<'a, Node> { self.last_child.assign(child.prev_sibling.get()); } Some(next_sibling) => { - next_sibling.prev_sibling.assign(child.prev_sibling.get()); + next_sibling.r().prev_sibling.assign(child.prev_sibling.get()); } } @@ -496,7 +496,7 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> { } s.push_str(self.debug_str().as_slice()); - debug!("{:s}", s); + debug!("{}", s); // FIXME: this should have a pure version? for kid in self.children() { @@ -683,7 +683,7 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> { Some(parent) => parent, }; - for sibling in parent.root().children() { + for sibling in parent.root().r().children() { sibling.set_has_dirty_siblings(true); } @@ -727,11 +727,11 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> { } fn get_bounding_content_box(self) -> Rect<Au> { - window_from_node(self).root().page().content_box_query(self.to_trusted_node_address()) + window_from_node(self).root().r().page().content_box_query(self.to_trusted_node_address()) } fn get_content_boxes(self) -> Vec<Rect<Au>> { - window_from_node(self).root().page().content_boxes_query(self.to_trusted_node_address()) + window_from_node(self).root().r().page().content_boxes_query(self.to_trusted_node_address()) } // http://dom.spec.whatwg.org/#dom-parentnode-queryselector @@ -782,7 +782,7 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> { unsafe { self.query_selector_iter(selectors).map(|mut iter| { let window = window_from_node(self).root(); - NodeList::new_simple_list(*window, iter.collect()) + NodeList::new_simple_list(window.r(), iter.collect()) }) } } @@ -803,7 +803,7 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> { } fn is_in_html_doc(self) -> bool { - self.owner_doc().root().is_html_document() + self.owner_doc().root().r().is_html_document() } fn children(self) -> NodeChildrenIterator<'a> { @@ -826,7 +826,7 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> { fn remove_self(self) { match self.parent_node().root() { - Some(parent) => parent.remove_child(self), + Some(parent) => parent.r().remove_child(self), None => () } } @@ -844,11 +844,11 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> { NodeInfo { uniqueId: self.unique_id.borrow().clone(), baseURI: self.GetBaseURI().unwrap_or("".into_string()), - parent: self.GetParentNode().root().map(|node| node.get_unique_id()).unwrap_or("".into_string()), + parent: self.GetParentNode().root().map(|node| node.r().get_unique_id()).unwrap_or("".into_string()), nodeType: self.NodeType() as uint, namespaceURI: "".into_string(), //FIXME nodeName: self.NodeName(), - numChildren: self.ChildNodes().root().Length() as uint, + numChildren: self.ChildNodes().root().r().Length() as uint, //FIXME doctype nodes only name: "".into_string(), @@ -862,8 +862,9 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> { isDocumentElement: self.owner_doc().root() + .r() .GetDocumentElement() - .map(|elem| NodeCast::from_ref(*elem.root()) == self) + .map(|elem| NodeCast::from_ref(elem.root().r()) == self) .unwrap_or(false), shortValue: self.GetNodeValue().unwrap_or("".into_string()), //FIXME: truncate @@ -1160,7 +1161,7 @@ impl Node { wrap_fn: extern "Rust" fn(*mut JSContext, GlobalRef, Box<N>) -> Temporary<N>) -> Temporary<N> { let window = document.window().root(); - reflect_dom_object(node, GlobalRef::Window(*window), wrap_fn) + reflect_dom_object(node, GlobalRef::Window(window.r()), wrap_fn) } pub fn new_inherited(type_id: NodeTypeId, doc: JSRef<Document>) -> Node { @@ -1211,14 +1212,14 @@ impl Node { // Step 1. match node.parent_node().root() { Some(parent) => { - Node::remove(node, *parent, SuppressObserver::Unsuppressed); + Node::remove(node, parent.r(), SuppressObserver::Unsuppressed); } None => (), } // Step 2. let node_doc = document_from_node(node).root(); - if *node_doc != document { + if node_doc.r() != document { for descendant in node.traverse_preorder() { descendant.set_owner_doc(document); } @@ -1430,7 +1431,7 @@ impl Node { match node { Some(node) => { let document = document_from_node(parent).root(); - Node::adopt(node, *document); + Node::adopt(node, document.r()); } None => (), } @@ -1520,16 +1521,16 @@ impl Node { let doctype: JSRef<DocumentType> = DocumentTypeCast::to_ref(node).unwrap(); let doctype = DocumentType::new(doctype.name().clone(), Some(doctype.public_id().clone()), - Some(doctype.system_id().clone()), *document); + Some(doctype.system_id().clone()), document.r()); NodeCast::from_temporary(doctype) }, NodeTypeId::DocumentFragment => { - let doc_fragment = DocumentFragment::new(*document); + let doc_fragment = DocumentFragment::new(document.r()); NodeCast::from_temporary(doc_fragment) }, NodeTypeId::Comment => { let comment: JSRef<Comment> = CommentCast::to_ref(node).unwrap(); - let comment = Comment::new(comment.characterdata().data().clone(), *document); + let comment = Comment::new(comment.characterdata().data().clone(), document.r()); NodeCast::from_temporary(comment) }, NodeTypeId::Document => { @@ -1539,7 +1540,7 @@ impl Node { false => IsHTMLDocument::NonHTMLDocument, }; let window = document.window().root(); - let document = Document::new(*window, Some(document.url().clone()), + let document = Document::new(window.r(), Some(document.url().clone()), is_html_doc, None, DocumentSource::NotFromParser); NodeCast::from_temporary(document) @@ -1552,67 +1553,67 @@ impl Node { }; let element = Element::create(name, element.prefix().as_ref().map(|p| p.as_slice().into_string()), - *document, ElementCreator::ScriptCreated); + document.r(), ElementCreator::ScriptCreated); NodeCast::from_temporary(element) }, NodeTypeId::Text => { let text: JSRef<Text> = TextCast::to_ref(node).unwrap(); - let text = Text::new(text.characterdata().data().clone(), *document); + let text = Text::new(text.characterdata().data().clone(), document.r()); NodeCast::from_temporary(text) }, NodeTypeId::ProcessingInstruction => { let pi: JSRef<ProcessingInstruction> = ProcessingInstructionCast::to_ref(node).unwrap(); let pi = ProcessingInstruction::new(pi.target().clone(), - pi.characterdata().data().clone(), *document); + pi.characterdata().data().clone(), document.r()); NodeCast::from_temporary(pi) }, }.root(); // Step 3. - let document = match DocumentCast::to_ref(*copy) { + let document = match DocumentCast::to_ref(copy.r()) { Some(doc) => doc, - None => *document, + None => document.r(), }; - assert!(*copy.owner_doc().root() == document); + assert!(copy.r().owner_doc().root().r() == document); // Step 4 (some data already copied in step 2). match node.type_id() { NodeTypeId::Document => { let node_doc: JSRef<Document> = DocumentCast::to_ref(node).unwrap(); - let copy_doc: JSRef<Document> = DocumentCast::to_ref(*copy).unwrap(); + let copy_doc: JSRef<Document> = DocumentCast::to_ref(copy.r()).unwrap(); copy_doc.set_encoding_name(node_doc.encoding_name().clone()); copy_doc.set_quirks_mode(node_doc.quirks_mode()); }, NodeTypeId::Element(..) => { let node_elem: JSRef<Element> = ElementCast::to_ref(node).unwrap(); - let copy_elem: JSRef<Element> = ElementCast::to_ref(*copy).unwrap(); + let copy_elem: JSRef<Element> = ElementCast::to_ref(copy.r()).unwrap(); // FIXME: https://github.com/mozilla/servo/issues/1737 let window = document.window().root(); for attr in node_elem.attrs().iter().map(|attr| attr.root()) { copy_elem.attrs_mut().push_unrooted( - &Attr::new(*window, - attr.local_name().clone(), attr.value().clone(), - attr.name().clone(), attr.namespace().clone(), - attr.prefix().clone(), Some(copy_elem))); + &Attr::new(window.r(), + attr.r().local_name().clone(), attr.r().value().clone(), + attr.r().name().clone(), attr.r().namespace().clone(), + attr.r().prefix().clone(), Some(copy_elem))); } }, _ => () } // Step 5: cloning steps. - vtable_for(&node).cloning_steps(*copy, maybe_doc, clone_children); + vtable_for(&node).cloning_steps(copy.r(), maybe_doc, clone_children); // Step 6. if clone_children == CloneChildrenFlag::CloneChildren { for child in node.children() { let child_copy = Node::clone(child, Some(document), clone_children).root(); - let _inserted_node = Node::pre_insert(*child_copy, *copy, None); + let _inserted_node = Node::pre_insert(child_copy.r(), copy.r(), None); } } // Step 7. - Temporary::from_rooted(*copy) + Temporary::from_rooted(copy.r()) } /// Sends layout data, if any, back to the layout task to be destroyed. @@ -1709,7 +1710,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { self.parent_node.get() .and_then(|parent| { let parent = parent.root(); - ElementCast::to_ref(*parent).map(|elem| { + ElementCast::to_ref(parent.r()).map(|elem| { Temporary::from_rooted(elem) }) }) @@ -1724,8 +1725,8 @@ impl<'a> NodeMethods for JSRef<'a, Node> { fn ChildNodes(self) -> Temporary<NodeList> { self.child_list.or_init(|| { let doc = self.owner_doc().root(); - let window = doc.window().root(); - NodeList::new_child_list(*window, self) + let window = doc.r().window().root(); + NodeList::new_child_list(window.r(), self) }) } @@ -1808,11 +1809,11 @@ impl<'a> NodeMethods for JSRef<'a, Node> { None } else { let document = self.owner_doc().root(); - Some(NodeCast::from_temporary(document.CreateTextNode(value))) + Some(NodeCast::from_temporary(document.r().CreateTextNode(value))) }.root(); // Step 3. - Node::replace_all(node.root_ref(), self); + Node::replace_all(node.r(), self); } NodeTypeId::Comment | NodeTypeId::Text | @@ -1822,7 +1823,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { // Notify the document that the content of this node is different let document = self.owner_doc().root(); - document.content_changed(self, NodeDamage::OtherNodeDamage); + document.r().content_changed(self, NodeDamage::OtherNodeDamage); } NodeTypeId::DocumentType | NodeTypeId::Document => {} @@ -1943,7 +1944,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { // Step 9. let document = document_from_node(self).root(); - Node::adopt(node, *document); + Node::adopt(node, document.r()); { // Step 10. @@ -2045,9 +2046,9 @@ impl<'a> NodeMethods for JSRef<'a, Node> { assert!(element.attrs().len() == other_element.attrs().len()); element.attrs().iter().map(|attr| attr.root()).all(|attr| { other_element.attrs().iter().map(|attr| attr.root()).any(|other_attr| { - (*attr.namespace() == *other_attr.namespace()) && - (attr.local_name() == other_attr.local_name()) && - (attr.value().as_slice() == other_attr.value().as_slice()) + (*attr.r().namespace() == *other_attr.r().namespace()) && + (attr.r().local_name() == other_attr.r().local_name()) && + (attr.r().value().as_slice() == other_attr.r().value().as_slice()) }) }) } @@ -2184,7 +2185,7 @@ pub fn document_from_node<T: NodeBase+Reflectable>(derived: JSRef<T>) -> Tempora pub fn window_from_node<T: NodeBase+Reflectable>(derived: JSRef<T>) -> Temporary<Window> { let document = document_from_node(derived).root(); - document.window() + document.r().window() } impl<'a> VirtualMethods for JSRef<'a, Node> { @@ -2280,12 +2281,12 @@ impl<'a> style::TNode<'a, JSRef<'a, Element>> for JSRef<'a, Node> { match attr.namespace { style::NamespaceConstraint::Specific(ref ns) => { self.as_element().get_attribute(ns.clone(), name).root() - .map_or(false, |attr| test(attr.value().as_slice())) + .map_or(false, |attr| test(attr.r().value().as_slice())) }, style::NamespaceConstraint::Any => { self.as_element().get_attributes(name).iter() .map(|attr| attr.root()) - .any(|attr| test(attr.value().as_slice())) + .any(|attr| test(attr.r().value().as_slice())) } } } @@ -2339,7 +2340,7 @@ impl<'a> DisabledStateHelpers for JSRef<'a, Node> { fn check_parent_disabled_state_for_option(self) { if self.get_disabled_state() { return; } match self.parent_node().root() { - Some(ref parent) if parent.is_htmloptgroupelement() && parent.get_disabled_state() => { + Some(ref parent) if parent.r().is_htmloptgroupelement() && parent.r().get_disabled_state() => { self.set_disabled_state(true); self.set_enabled_state(false); }, |