From ffdc3f5b32a345b88eed774848924e862d47c093 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 28 Mar 2014 10:17:56 -0400 Subject: Turn on GC all the time. Fix rooting errors during parsing and storing timers. Fix borrow errors during tracing. --- src/components/script/dom/htmlserializer.rs | 34 ++++++++++++++++++----------- 1 file changed, 21 insertions(+), 13 deletions(-) (limited to 'src/components/script/dom/htmlserializer.rs') diff --git a/src/components/script/dom/htmlserializer.rs b/src/components/script/dom/htmlserializer.rs index 8bd5beb6cf8..e99982822ed 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}; use dom::bindings::codegen::InheritTypes::{DocumentTypeCast, CharacterDataCast}; use dom::bindings::codegen::InheritTypes::ProcessingInstructionCast; -use dom::bindings::js::JS; +use dom::bindings::js::{JS, JSRef, RootCollection}; use dom::characterdata::CharacterData; use dom::comment::Comment; use dom::documenttype::DocumentType; @@ -20,6 +20,7 @@ use dom::processinginstruction::ProcessingInstruction; use dom::text::Text; pub fn serialize(iterator: &mut NodeIterator) -> ~str { + let roots = RootCollection::new(); let mut html = ~""; let mut open_elements: Vec<~str> = vec!(); @@ -31,23 +32,28 @@ pub fn serialize(iterator: &mut NodeIterator) -> ~str { match node.type_id() { ElementNodeTypeId(..) => { let elem: JS = ElementCast::to(&node).unwrap(); - serialize_elem(&elem, &mut open_elements) + let elem = elem.root(&roots); + serialize_elem(&elem.root_ref(), &mut open_elements) } CommentNodeTypeId => { let comment: JS = CommentCast::to(&node).unwrap(); - serialize_comment(&comment) + let comment = comment.root(&roots); + serialize_comment(&comment.root_ref()) } TextNodeTypeId => { let text: JS = TextCast::to(&node).unwrap(); - serialize_text(&text) + let text = text.root(&roots); + serialize_text(&text.root_ref()) } DoctypeNodeTypeId => { let doctype: JS = DocumentTypeCast::to(&node).unwrap(); - serialize_doctype(&doctype) + let doctype = doctype.root(&roots); + serialize_doctype(&doctype.root_ref()) } ProcessingInstructionNodeTypeId => { let processing_instruction: JS = ProcessingInstructionCast::to(&node).unwrap(); - serialize_processing_instruction(&processing_instruction) + let processing_instruction = processing_instruction.root(&roots); + serialize_processing_instruction(&processing_instruction.root_ref()) } DocumentFragmentNodeTypeId => { ~"" @@ -64,11 +70,11 @@ pub fn serialize(iterator: &mut NodeIterator) -> ~str { html } -fn serialize_comment(comment: &JS) -> ~str { +fn serialize_comment(comment: &JSRef) -> ~str { ~"" } -fn serialize_text(text: &JS) -> ~str { +fn serialize_text(text: &JSRef) -> ~str { match text.get().characterdata.node.parent_node { Some(ref parent) if parent.is_element() => { let elem: JS = ElementCast::to(parent).unwrap(); @@ -85,18 +91,20 @@ fn serialize_text(text: &JS) -> ~str { } } -fn serialize_processing_instruction(processing_instruction: &JS) -> ~str { +fn serialize_processing_instruction(processing_instruction: &JSRef) -> ~str { ~"" } -fn serialize_doctype(doctype: &JS) -> ~str { +fn serialize_doctype(doctype: &JSRef) -> ~str { ~"" } -fn serialize_elem(elem: &JS, open_elements: &mut Vec<~str>) -> ~str { +fn serialize_elem(elem: &JSRef, open_elements: &mut Vec<~str>) -> ~str { + let roots = RootCollection::new(); let mut rv = ~"<" + elem.get().local_name; for attr in elem.get().attrs.iter() { - rv.push_str(serialize_attr(attr)); + let attr = attr.root(&roots); + rv.push_str(serialize_attr(&attr.root_ref())); }; rv.push_str(">"); match elem.get().local_name.as_slice() { @@ -119,7 +127,7 @@ fn serialize_elem(elem: &JS, open_elements: &mut Vec<~str>) -> ~str { rv } -fn serialize_attr(attr: &JS) -> ~str { +fn serialize_attr(attr: &JSRef) -> ~str { let attr_name = if attr.get().namespace == namespace::XML { ~"xml:" + attr.get().local_name.clone() } else if attr.get().namespace == namespace::XMLNS && -- cgit v1.2.3 From d7b96db33ca8f2b8a162df38e0f00e95f5ea6fa1 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 31 Mar 2014 18:41:28 -0400 Subject: Implement safe rooting strategy via Unrooted, Root, JSRef, and JS. --- src/components/script/dom/htmlserializer.rs | 46 ++++++++++++++--------------- 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'src/components/script/dom/htmlserializer.rs') diff --git a/src/components/script/dom/htmlserializer.rs b/src/components/script/dom/htmlserializer.rs index e99982822ed..55c1ba03d9e 100644 --- a/src/components/script/dom/htmlserializer.rs +++ b/src/components/script/dom/htmlserializer.rs @@ -4,15 +4,15 @@ use servo_util::namespace; use dom::attr::Attr; -use dom::bindings::codegen::InheritTypes::{ElementCast, TextCast, CommentCast}; +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::{JS, JSRef, RootCollection}; +use dom::bindings::js::{JSRef, RootCollection}; use dom::characterdata::CharacterData; use dom::comment::Comment; use dom::documenttype::DocumentType; use dom::element::Element; -use dom::node::NodeIterator; +use dom::node::{Node, NodeIterator}; use dom::node::{DoctypeNodeTypeId, DocumentFragmentNodeTypeId, CommentNodeTypeId}; use dom::node::{DocumentNodeTypeId, ElementNodeTypeId, ProcessingInstructionNodeTypeId}; use dom::node::{TextNodeTypeId, NodeHelpers}; @@ -20,7 +20,6 @@ use dom::processinginstruction::ProcessingInstruction; use dom::text::Text; pub fn serialize(iterator: &mut NodeIterator) -> ~str { - let roots = RootCollection::new(); let mut html = ~""; let mut open_elements: Vec<~str> = vec!(); @@ -31,29 +30,25 @@ pub fn serialize(iterator: &mut NodeIterator) -> ~str { html.push_str( match node.type_id() { ElementNodeTypeId(..) => { - let elem: JS = ElementCast::to(&node).unwrap(); - let elem = elem.root(&roots); - serialize_elem(&elem.root_ref(), &mut open_elements) + let elem: &JSRef = ElementCast::to_ref(&node).unwrap(); + serialize_elem(elem, &mut open_elements) } CommentNodeTypeId => { - let comment: JS = CommentCast::to(&node).unwrap(); - let comment = comment.root(&roots); - serialize_comment(&comment.root_ref()) + let comment: &JSRef = CommentCast::to_ref(&node).unwrap(); + serialize_comment(comment) } TextNodeTypeId => { - let text: JS = TextCast::to(&node).unwrap(); - let text = text.root(&roots); - serialize_text(&text.root_ref()) + let text: &JSRef = TextCast::to_ref(&node).unwrap(); + serialize_text(text) } DoctypeNodeTypeId => { - let doctype: JS = DocumentTypeCast::to(&node).unwrap(); - let doctype = doctype.root(&roots); - serialize_doctype(&doctype.root_ref()) + let doctype: &JSRef = DocumentTypeCast::to_ref(&node).unwrap(); + serialize_doctype(doctype) } ProcessingInstructionNodeTypeId => { - let processing_instruction: JS = ProcessingInstructionCast::to(&node).unwrap(); - let processing_instruction = processing_instruction.root(&roots); - serialize_processing_instruction(&processing_instruction.root_ref()) + let processing_instruction: &JSRef = + ProcessingInstructionCast::to_ref(&node).unwrap(); + serialize_processing_instruction(processing_instruction) } DocumentFragmentNodeTypeId => { ~"" @@ -75,9 +70,11 @@ fn serialize_comment(comment: &JSRef) -> ~str { } fn serialize_text(text: &JSRef) -> ~str { - match text.get().characterdata.node.parent_node { + let roots = RootCollection::new(); + let text_node: &JSRef = NodeCast::from_ref(text); + match text_node.parent_node().map(|node| node.root(&roots)) { Some(ref parent) if parent.is_element() => { - let elem: JS = ElementCast::to(parent).unwrap(); + let elem: &JSRef = ElementCast::to_ref(&**parent).unwrap(); match elem.get().local_name.as_slice() { "style" | "script" | "xmp" | "iframe" | "noembed" | "noframes" | "plaintext" | @@ -104,14 +101,15 @@ fn serialize_elem(elem: &JSRef, open_elements: &mut Vec<~str>) -> ~str let mut rv = ~"<" + elem.get().local_name; for attr in elem.get().attrs.iter() { let attr = attr.root(&roots); - rv.push_str(serialize_attr(&attr.root_ref())); + 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 => { - match elem.get().node.first_child { + let node: &JSRef = NodeCast::from_ref(elem); + match node.first_child().map(|child| child.root(&roots)) { Some(ref child) if child.is_text() => { - let text: JS = CharacterDataCast::to(child).unwrap(); + let text: &JSRef = CharacterDataCast::to_ref(&**child).unwrap(); if text.get().data.len() > 0 && text.get().data[0] == 0x0A as u8 { rv.push_str("\x0A"); } -- cgit v1.2.3 From 7b3e6d1f2125faf598919722b72cc56197d0102c Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 17 Apr 2014 23:26:42 -0400 Subject: Remove all root collections. --- src/components/script/dom/htmlserializer.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/components/script/dom/htmlserializer.rs') 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) -> ~str { } fn serialize_text(text: &JSRef) -> ~str { - let roots = RootCollection::new(); let text_node: &JSRef = 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 = ElementCast::to_ref(&**parent).unwrap(); match elem.get().local_name.as_slice() { @@ -97,17 +96,16 @@ fn serialize_doctype(doctype: &JSRef) -> ~str { } fn serialize_elem(elem: &JSRef, 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 = 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 = CharacterDataCast::to_ref(&**child).unwrap(); if text.get().data.len() > 0 && text.get().data[0] == 0x0A as u8 { -- cgit v1.2.3 From 91278da9dd55582401154e07f9eea34425a332c2 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 24 Apr 2014 13:03:19 -0400 Subject: Address review comments. --- src/components/script/dom/htmlserializer.rs | 50 ++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'src/components/script/dom/htmlserializer.rs') diff --git a/src/components/script/dom/htmlserializer.rs b/src/components/script/dom/htmlserializer.rs index 9f2bdf3e40b..3a2148547ee 100644 --- a/src/components/script/dom/htmlserializer.rs +++ b/src/components/script/dom/htmlserializer.rs @@ -66,7 +66,7 @@ pub fn serialize(iterator: &mut NodeIterator) -> ~str { } fn serialize_comment(comment: &JSRef) -> ~str { - ~"" + ~"" } fn serialize_text(text: &JSRef) -> ~str { @@ -74,41 +74,41 @@ fn serialize_text(text: &JSRef) -> ~str { match text_node.parent_node().map(|node| node.root()) { Some(ref parent) if parent.is_element() => { let elem: &JSRef = ElementCast::to_ref(&**parent).unwrap(); - match elem.get().local_name.as_slice() { + match elem.deref().local_name.as_slice() { "style" | "script" | "xmp" | "iframe" | "noembed" | "noframes" | "plaintext" | - "noscript" if elem.get().namespace == namespace::HTML => { - text.get().characterdata.data.clone() + "noscript" if elem.deref().namespace == namespace::HTML => { + text.deref().characterdata.data.clone() }, - _ => escape(text.get().characterdata.data, false) + _ => escape(text.deref().characterdata.data, false) } } - _ => escape(text.get().characterdata.data, false) + _ => escape(text.deref().characterdata.data, false) } } fn serialize_processing_instruction(processing_instruction: &JSRef) -> ~str { - ~"" + ~"" } fn serialize_doctype(doctype: &JSRef) -> ~str { - ~"" + ~"" } fn serialize_elem(elem: &JSRef, open_elements: &mut Vec<~str>) -> ~str { - let mut rv = ~"<" + elem.get().local_name; - for attr in elem.get().attrs.iter() { + let mut rv = ~"<" + elem.deref().local_name; + for attr in elem.deref().attrs.iter() { 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 => { + match elem.deref().local_name.as_slice() { + "pre" | "listing" | "textarea" if elem.deref().namespace == namespace::HTML => { let node: &JSRef = NodeCast::from_ref(elem); match node.first_child().map(|child| child.root()) { Some(ref child) if child.is_text() => { let text: &JSRef = CharacterDataCast::to_ref(&**child).unwrap(); - if text.get().data.len() > 0 && text.get().data[0] == 0x0A as u8 { + if text.deref().data.len() > 0 && text.deref().data[0] == 0x0A as u8 { rv.push_str("\x0A"); } }, @@ -117,26 +117,26 @@ fn serialize_elem(elem: &JSRef, open_elements: &mut Vec<~str>) -> ~str }, _ => {} } - if !elem.get().is_void() { - open_elements.push(elem.get().local_name.clone()); + if !elem.deref().is_void() { + open_elements.push(elem.deref().local_name.clone()); } rv } fn serialize_attr(attr: &JSRef) -> ~str { - let attr_name = if attr.get().namespace == namespace::XML { - ~"xml:" + attr.get().local_name.clone() - } else if attr.get().namespace == namespace::XMLNS && - attr.get().local_name.as_slice() == "xmlns" { + let attr_name = if attr.deref().namespace == namespace::XML { + ~"xml:" + attr.deref().local_name.clone() + } else if attr.deref().namespace == namespace::XMLNS && + attr.deref().local_name.as_slice() == "xmlns" { ~"xmlns" - } else if attr.get().namespace == namespace::XMLNS { - ~"xmlns:" + attr.get().local_name.clone() - } else if attr.get().namespace == namespace::XLink { - ~"xlink:" + attr.get().local_name.clone() + } else if attr.deref().namespace == namespace::XMLNS { + ~"xmlns:" + attr.deref().local_name.clone() + } else if attr.deref().namespace == namespace::XLink { + ~"xlink:" + attr.deref().local_name.clone() } else { - attr.get().name.clone() + attr.deref().name.clone() }; - ~" " + attr_name + "=\"" + escape(attr.get().value, true) + "\"" + ~" " + attr_name + "=\"" + escape(attr.deref().value, true) + "\"" } fn escape(string: &str, attr_mode: bool) -> ~str { -- cgit v1.2.3