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

Convert &JSRef -> JSRef for the PrivateNodeHelpers trait

Browse source
This commit is contained in:
Cameron Zwarich 2014-09-26 15:46:37 -07:00
parent ab17d31bbf
commit 4f32d54fd8
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -248,17 +248,17 @@ pub enum NodeTypeId {
} }
trait PrivateNodeHelpers { trait PrivateNodeHelpers {
fn node_inserted(&self); fn node_inserted(self);
fn node_removed(&self, parent_in_doc: bool); fn node_removed(self, parent_in_doc: bool);
fn add_child(&self, new_child: JSRef<Node>, before: Option<JSRef<Node>>); fn add_child(self, new_child: JSRef<Node>, before: Option<JSRef<Node>>);
fn remove_child(&self, child: JSRef<Node>); fn remove_child(self, child: JSRef<Node>);
} }
impl<'a> PrivateNodeHelpers for JSRef<'a, Node> { impl<'a> PrivateNodeHelpers for JSRef<'a, Node> {
// http://dom.spec.whatwg.org/#node-is-inserted // http://dom.spec.whatwg.org/#node-is-inserted
fn node_inserted(&self) { fn node_inserted(self) {
assert!(self.parent_node().is_some()); assert!(self.parent_node().is_some());
let document = document_from_node(*self).root(); let document = document_from_node(self).root();
let is_in_doc = self.is_in_doc(); let is_in_doc = self.is_in_doc();
for node in self.traverse_preorder() { for node in self.traverse_preorder() {
@ -266,15 +266,15 @@ impl<'a> PrivateNodeHelpers for JSRef<'a, Node> {
} }
let parent = self.parent_node().root(); let parent = self.parent_node().root();
parent.map(|parent| vtable_for(&*parent).child_inserted(*self)); parent.map(|parent| vtable_for(&*parent).child_inserted(self));
document.deref().content_changed(); document.deref().content_changed();
} }
// http://dom.spec.whatwg.org/#node-is-removed // http://dom.spec.whatwg.org/#node-is-removed
fn node_removed(&self, parent_in_doc: bool) { fn node_removed(self, parent_in_doc: bool) {
assert!(self.parent_node().is_none()); assert!(self.parent_node().is_none());
let document = document_from_node(*self).root(); let document = document_from_node(self).root();
for node in self.traverse_preorder() { for node in self.traverse_preorder() {
vtable_for(&node).unbind_from_tree(parent_in_doc); vtable_for(&node).unbind_from_tree(parent_in_doc);
@ -290,7 +290,7 @@ impl<'a> PrivateNodeHelpers for JSRef<'a, Node> {
/// Adds a new child to the end of this node's list of children. /// Adds a new child to the end of this node's list of children.
/// ///
/// Fails unless `new_child` is disconnected from the tree. /// Fails unless `new_child` is disconnected from the tree.
fn add_child(&self, new_child: JSRef<Node>, before: Option<JSRef<Node>>) { fn add_child(self, new_child: JSRef<Node>, before: Option<JSRef<Node>>) {
let doc = self.owner_doc().root(); let doc = self.owner_doc().root();
doc.deref().wait_until_safe_to_modify_dom(); doc.deref().wait_until_safe_to_modify_dom();
@ -299,7 +299,7 @@ impl<'a> PrivateNodeHelpers for JSRef<'a, Node> {
assert!(new_child.next_sibling().is_none()); assert!(new_child.next_sibling().is_none());
match before { match before {
Some(ref before) => { Some(ref before) => {
assert!(before.parent_node().root().root_ref() == Some(*self)); assert!(before.parent_node().root().root_ref() == Some(self));
match before.prev_sibling().root() { match before.prev_sibling().root() {
None => { None => {
assert!(Some(*before) == self.first_child().root().root_ref()); assert!(Some(*before) == self.first_child().root().root_ref());
@ -327,17 +327,17 @@ impl<'a> PrivateNodeHelpers for JSRef<'a, Node> {
}, },
} }
new_child.parent_node.assign(Some(*self)); new_child.parent_node.assign(Some(self));
} }
/// Removes the given child from this node's list of children. /// Removes the given child from this node's list of children.
/// ///
/// Fails unless `child` is a child of this node. /// Fails unless `child` is a child of this node.
fn remove_child(&self, child: JSRef<Node>) { fn remove_child(self, child: JSRef<Node>) {
let doc = self.owner_doc().root(); let doc = self.owner_doc().root();
doc.deref().wait_until_safe_to_modify_dom(); doc.deref().wait_until_safe_to_modify_dom();
assert!(child.parent_node().root().root_ref() == Some(*self)); assert!(child.parent_node().root().root_ref() == Some(self));
match child.prev_sibling.get().root() { match child.prev_sibling.get().root() {
None => { None => {