diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index 7b4f7a8aea0..49cf5f257ed 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -524,8 +524,7 @@ impl<'a> HTMLScriptElementMethods for JSRef<'a, HTMLScriptElement> {
// http://www.whatwg.org/html/#dom-script-text
fn Text(self) -> DOMString {
- let node: JSRef = NodeCast::from_ref(self);
- Node::collect_text_contents(node.children().map(|c| c.root()).map(|c| c.get_unsound_ref_forever()))
+ Node::collect_text_contents(NodeCast::from_ref(self).children())
}
// http://www.whatwg.org/html/#dom-script-text
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 95374e4f360..822fe4ff4e6 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -1681,10 +1681,11 @@ impl Node {
Temporary::from_rooted(copy.r())
}
- pub fn collect_text_contents<'a, T: Iterator- >>(iterator: T) -> String {
+ pub fn collect_text_contents>>(iterator: T) -> String {
let mut content = String::new();
for node in iterator {
- let text: Option> = TextCast::to_ref(node);
+ let node = node.root();
+ let text = TextCast::to_ref(node.r());
match text {
Some(text) => content.push_str(text.characterdata().data().as_slice()),
None => (),
@@ -1832,7 +1833,8 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
match self.type_id {
NodeTypeId::DocumentFragment |
NodeTypeId::Element(..) => {
- let content = Node::collect_text_contents(self.traverse_preorder());
+ let content = Node::collect_text_contents(
+ self.traverse_preorder().map(Temporary::from_rooted));
Some(content)
}
NodeTypeId::Comment |