diff options
author | Josh Matthews <josh@joshmatthews.net> | 2014-04-17 23:26:42 -0400 |
---|---|---|
committer | Josh Matthews <josh@joshmatthews.net> | 2014-05-03 14:18:31 -0400 |
commit | 7b3e6d1f2125faf598919722b72cc56197d0102c (patch) | |
tree | bc5a2f34b3d5924e49fb586bcfbb7b022758093c /src/components/script/dom/htmlserializer.rs | |
parent | aaf0a6119414072b34e3ef2109827eaf2f2a3156 (diff) | |
download | servo-7b3e6d1f2125faf598919722b72cc56197d0102c.tar.gz servo-7b3e6d1f2125faf598919722b72cc56197d0102c.zip |
Remove all root collections.
Diffstat (limited to 'src/components/script/dom/htmlserializer.rs')
-rw-r--r-- | src/components/script/dom/htmlserializer.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/components/script/dom/htmlserializer.rs b/src/components/script/dom/htmlserializer.rs index 55c1ba03d9e..9f2bdf3e40b 100644 --- a/src/components/script/dom/htmlserializer.rs +++ b/src/components/script/dom/htmlserializer.rs @@ -7,7 +7,7 @@ use dom::attr::Attr; use dom::bindings::codegen::InheritTypes::{ElementCast, TextCast, CommentCast, NodeCast}; use dom::bindings::codegen::InheritTypes::{DocumentTypeCast, CharacterDataCast}; use dom::bindings::codegen::InheritTypes::ProcessingInstructionCast; -use dom::bindings::js::{JSRef, RootCollection}; +use dom::bindings::js::JSRef; use dom::characterdata::CharacterData; use dom::comment::Comment; use dom::documenttype::DocumentType; @@ -70,9 +70,8 @@ fn serialize_comment(comment: &JSRef<Comment>) -> ~str { } fn serialize_text(text: &JSRef<Text>) -> ~str { - let roots = RootCollection::new(); let text_node: &JSRef<Node> = NodeCast::from_ref(text); - match text_node.parent_node().map(|node| node.root(&roots)) { + match text_node.parent_node().map(|node| node.root()) { Some(ref parent) if parent.is_element() => { let elem: &JSRef<Element> = ElementCast::to_ref(&**parent).unwrap(); match elem.get().local_name.as_slice() { @@ -97,17 +96,16 @@ fn serialize_doctype(doctype: &JSRef<DocumentType>) -> ~str { } fn serialize_elem(elem: &JSRef<Element>, open_elements: &mut Vec<~str>) -> ~str { - let roots = RootCollection::new(); let mut rv = ~"<" + elem.get().local_name; for attr in elem.get().attrs.iter() { - let attr = attr.root(&roots); + let attr = attr.root(); rv.push_str(serialize_attr(&*attr)); }; rv.push_str(">"); match elem.get().local_name.as_slice() { "pre" | "listing" | "textarea" if elem.get().namespace == namespace::HTML => { let node: &JSRef<Node> = NodeCast::from_ref(elem); - match node.first_child().map(|child| child.root(&roots)) { + match node.first_child().map(|child| child.root()) { Some(ref child) if child.is_text() => { let text: &JSRef<CharacterData> = CharacterDataCast::to_ref(&**child).unwrap(); if text.get().data.len() > 0 && text.get().data[0] == 0x0A as u8 { |