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

Refactor fragment parsing

Browse source
This commit is contained in:
Chris Paris 2015-03-20 22:37:05 -10:00
parent 3c5c2f416b
commit 63ced23fca
3 changed files with 74 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/script/dom/node.rs
View file

@ -46,6 +46,7 @@ use dom::window::{Window, WindowHelpers};
use geom::rect::Rect;
use layout_interface::{LayoutChan, Msg};
use devtools_traits::NodeInfo;
use parse::html::{HTMLInput, parse_html_fragment};
use script_traits::UntrustedNodeAddress;
use util::geometry::Au;
use util::str::{DOMString, null_str_as_empty};
@ -502,6 +503,8 @@ pub trait NodeHelpers<'a> {
fn summarize(self) -> NodeInfo;
fn teardown(self);
fn parse_fragment(self, markup: HTMLInput) -> Fallible<Temporary<DocumentFragment>>;
}
impl<'a> NodeHelpers<'a> for JSRef<'a, Node> {
@ -929,6 +932,24 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> {
}
}
// https://dvcs.w3.org/hg/innerhtml/raw-file/tip/index.html#dfn-concept-parse-fragment
fn parse_fragment(self, markup: HTMLInput) -> Fallible<Temporary<DocumentFragment>> {
let context_node: JSRef<Node> = NodeCast::from_ref(self);
let context_document = document_from_node(self).root();
let new_children =
if context_document.r().is_html_document() {
parse_html_fragment(context_node, markup)
} else {
// FIXME: XML case
unimplemented!()
};
let fragment = DocumentFragment::new(context_document.r()).root();
let fragment_node: JSRef<Node> = NodeCast::from_ref(fragment.r());
for node in new_children {
try!(fragment_node.AppendChild(node.root().r()));
}
Ok(Temporary::from_rooted(fragment.r()))
}
}
/// If the given untrusted node address represents a valid DOM node in the given runtime,
@ -1456,7 +1477,7 @@ impl Node {
}
// http://dom.spec.whatwg.org/#concept-node-replace-all
fn replace_all(node: Option<JSRef<Node>>, parent: JSRef<Node>) {
pub fn replace_all(node: Option<JSRef<Node>>, parent: JSRef<Node>) {
// Step 1.
match node {
Some(node) => {