diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2014-04-11 19:18:19 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2014-04-14 14:59:03 +0100 |
| commit | 7f139b2b0700973d4e4a2e7c1a99652e90414555 (patch) | |
| tree | 9cad66720fb43d629312bdf57943733bf1bb8c94 | |
| parent | 49521baee7507dc0e5a85a626e98c2373e6e9d7a (diff) | |
| download | servo-7f139b2b0700973d4e4a2e7c1a99652e90414555.tar.gz servo-7f139b2b0700973d4e4a2e7c1a99652e90414555.zip | |
Merge new_with_pseudo_without_self() and new_with_pseudo() into with_pseudo()
| -rw-r--r-- | src/components/main/layout/wrapper.rs | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/components/main/layout/wrapper.rs b/src/components/main/layout/wrapper.rs index 85ada5e486e..b4b385d54f5 100644 --- a/src/components/main/layout/wrapper.rs +++ b/src/components/main/layout/wrapper.rs @@ -450,10 +450,10 @@ impl<'ln> TLayoutNode for ThreadSafeLayoutNode<'ln> { if self.has_before_pseudo() { if self.is_block(Before) && self.pseudo == Normal { - let pseudo_before_node = ThreadSafeLayoutNode::new_with_pseudo_without_self(&self.node, BeforeBlock); + let pseudo_before_node = self.with_pseudo(BeforeBlock); return Some(pseudo_before_node) } else if self.pseudo == Normal || self.pseudo == BeforeBlock { - let pseudo_before_node = ThreadSafeLayoutNode::new_with_pseudo_without_self(&self.node, Before); + let pseudo_before_node = self.with_pseudo(Before); return Some(pseudo_before_node) } } @@ -497,16 +497,9 @@ impl<'ln> ThreadSafeLayoutNode<'ln> { } } - pub fn new_with_pseudo_without_self<'a>(node: &LayoutNode<'a>, pseudo: PseudoElementType) -> ThreadSafeLayoutNode<'a> { - ThreadSafeLayoutNode { - node: node.clone(), - pseudo: pseudo, - } - } - - - /// Creates a new `ThreadSafeLayoutNode` from the given `LayoutNode`. - pub fn new_with_pseudo<'a>(&'a self, pseudo: PseudoElementType) -> ThreadSafeLayoutNode<'a> { + /// Creates a new `ThreadSafeLayoutNode` for the same `LayoutNode` + /// with a differet pseudo-element type. + pub fn with_pseudo(&self, pseudo: PseudoElementType) -> ThreadSafeLayoutNode<'ln> { ThreadSafeLayoutNode { node: self.node.clone(), pseudo: pseudo, @@ -661,10 +654,10 @@ impl<'a> Iterator<ThreadSafeLayoutNode<'a>> for ThreadSafeLayoutNodeChildrenIter Some(ref parent_node) => { if parent_node.has_after_pseudo() { let pseudo_after_node = if parent_node.is_block(After) && parent_node.pseudo == Normal { - let pseudo_after_node = ThreadSafeLayoutNode::new_with_pseudo_without_self(&parent_node.node, AfterBlock); + let pseudo_after_node = parent_node.with_pseudo(AfterBlock); Some(pseudo_after_node) } else if parent_node.pseudo == Normal || parent_node.pseudo == AfterBlock { - let pseudo_after_node = ThreadSafeLayoutNode::new_with_pseudo_without_self(&parent_node.node, After); + let pseudo_after_node = parent_node.with_pseudo(After); Some(pseudo_after_node) } else { None |