Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Untry script

Browse source
This commit is contained in:
Simon Sapin 2017-06-18 13:21:32 +02:00
parent a5bb55790f
commit 7af5a7fd54
36 changed files with 199 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -631,7 +631,7 @@ impl Node {
let viable_previous_sibling = first_node_not_in(self.preceding_siblings(), &nodes);
// Step 4.
let node = try!(self.owner_doc().node_from_nodes_and_strings(nodes));
let node = self.owner_doc().node_from_nodes_and_strings(nodes)?;
// Step 5.
let viable_previous_sibling = match viable_previous_sibling {
@ -640,7 +640,7 @@ impl Node {
};
// Step 6.
try!(Node::pre_insert(&node, &parent, viable_previous_sibling.r()));
Node::pre_insert(&node, &parent, viable_previous_sibling.r())?;
Ok(())
}
@ -660,10 +660,10 @@ impl Node {
let viable_next_sibling = first_node_not_in(self.following_siblings(), &nodes);
// Step 4.
let node = try!(self.owner_doc().node_from_nodes_and_strings(nodes));
let node = self.owner_doc().node_from_nodes_and_strings(nodes)?;
// Step 5.
try!(Node::pre_insert(&node, &parent, viable_next_sibling.r()));
Node::pre_insert(&node, &parent, viable_next_sibling.r())?;
Ok(())
}
@ -680,13 +680,13 @@ impl Node {
// Step 3.
let viable_next_sibling = first_node_not_in(self.following_siblings(), &nodes);
// Step 4.
let node = try!(self.owner_doc().node_from_nodes_and_strings(nodes));
let node = self.owner_doc().node_from_nodes_and_strings(nodes)?;
if self.parent_node == Some(&*parent) {
// Step 5.
try!(parent.ReplaceChild(&node, self));
parent.ReplaceChild(&node, self)?;
} else {
// Step 6.
try!(Node::pre_insert(&node, &parent, viable_next_sibling.r()));
Node::pre_insert(&node, &parent, viable_next_sibling.r())?;
}
Ok(())
}
@ -695,7 +695,7 @@ impl Node {
pub fn prepend(&self, nodes: Vec<NodeOrString>) -> ErrorResult {
// Step 1.
let doc = self.owner_doc();
let node = try!(doc.node_from_nodes_and_strings(nodes));
let node = doc.node_from_nodes_and_strings(nodes)?;
// Step 2.
let first_child = self.first_child.get();
Node::pre_insert(&node, self, first_child.r()).map(|_| ())
@ -705,7 +705,7 @@ impl Node {
pub fn append(&self, nodes: Vec<NodeOrString>) -> ErrorResult {
// Step 1.
let doc = self.owner_doc();
let node = try!(doc.node_from_nodes_and_strings(nodes));
let node = doc.node_from_nodes_and_strings(nodes)?;
// Step 2.
self.AppendChild(&node).map(|_| ())
}
@ -751,7 +751,7 @@ impl Node {
#[allow(unsafe_code)]
pub fn query_selector_all(&self, selectors: DOMString) -> Fallible<Root<NodeList>> {
let window = window_from_node(self);
let iter = try!(self.query_selector_iter(selectors));
let iter = self.query_selector_iter(selectors)?;
Ok(NodeList::new_simple_list(&window, iter))
}
@ -852,7 +852,7 @@ impl Node {
{
let tr_node = tr.upcast::<Node>();
if index == -1 {
try!(self.InsertBefore(tr_node, None));
self.InsertBefore(tr_node, None)?;
} else {
let items = get_items();
let node = match items.elements_iter()
@ -863,7 +863,7 @@ impl Node {
None => return Err(Error::IndexSize),
Some(node) => node,
};
try!(self.InsertBefore(tr_node, node.r()));
self.InsertBefore(tr_node, node.r())?;
}
}
@ -1566,7 +1566,7 @@ impl Node {
pub fn pre_insert(node: &Node, parent: &Node, child: Option<&Node>)
-> Fallible<Root<Node>> {
// Step 1.
try!(Node::ensure_pre_insertion_validity(node, parent, child));
Node::ensure_pre_insertion_validity(node, parent, child)?;
// Steps 2-3.
let reference_child_root;