Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Avoid some rooting in parsing.

Browse source
This commit is contained in:
Ms2ger 2015-12-11 09:40:17 -05:00
parent 4e73a30b00
commit 14acf1616e
3 changed files with 19 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/script/parse/html.rs
View file

@ -24,6 +24,7 @@ use dom::node::{document_from_node, window_from_node};
use dom::processinginstruction::ProcessingInstruction;
use dom::servohtmlparser;
use dom::servohtmlparser::{FragmentContext, ServoHTMLParser};
use dom::text::Text;
use encoding::types::Encoding;
use html5ever::Attribute;
use html5ever::serialize::TraversalScope;
@ -39,6 +40,20 @@ use tendril::StrTendril;
use url::Url;
use util::str::DOMString;
fn insert(parent: &Node, reference_child: Option<&Node>, child: NodeOrText<JS<Node>>) {
match child {
NodeOrText::AppendNode(n) => {
assert!(parent.InsertBefore(&n, reference_child).is_ok());
},
NodeOrText::AppendText(t) => {
// FIXME(ajeffrey): convert directly from tendrils to DOMStrings
let s: String = t.into();
let text = Text::new(DOMString::from(s), &parent.owner_doc());
assert!(parent.InsertBefore(text.upcast(), reference_child).is_ok());
}
}
}
impl<'a> TreeSink for servohtmlparser::Sink {
type Handle = JS<Node>;
@ -91,8 +106,7 @@ impl<'a> TreeSink for servohtmlparser::Sink {
None => return Err(new_node),
};
let child = self.get_or_create(new_node);
assert!(parent.InsertBefore(child.r(), Some(&*sibling)).is_ok());
insert(&parent, Some(&*sibling), new_node);
Ok(())
}
@ -105,10 +119,8 @@ impl<'a> TreeSink for servohtmlparser::Sink {
}
fn append(&mut self, parent: JS<Node>, child: NodeOrText<JS<Node>>) {
let child = self.get_or_create(child);
// FIXME(#3701): Use a simpler algorithm and merge adjacent text nodes
assert!(parent.AppendChild(child.r()).is_ok());
insert(&parent, None, child);
}
fn append_doctype_to_document(&mut self, name: StrTendril, public_id: StrTendril,