Auto merge of #5931 - nox:rm-helpers, r=jdm

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5931)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-06 01:31:26 -05:00
commit 16a7c792b5
8 changed files with 227 additions and 331 deletions

View file

@ -121,7 +121,7 @@ impl<'a> TreeSink for servohtmlparser::Sink {
new_node: NodeOrText<JS<Node>>) -> Result<(), NodeOrText<JS<Node>>> {
// If there is no parent, return the node to the parser.
let sibling: Root<Node> = sibling.root();
let parent = match sibling.r().parent_node() {
let parent = match sibling.r().GetParentNode() {
Some(p) => p.root(),
None => return Err(new_node),
};