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

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

19
components/script/dom/servohtmlparser.rs
View file

@ -16,13 +16,12 @@ use dom::bindings::trace::JSTraceable;
use dom::document::Document;
use dom::node::Node;
use dom::servoxmlparser::ServoXMLParser;
use dom::text::Text;
use dom::window::Window;
use encoding::all::UTF_8;
use encoding::types::{DecoderTrap, Encoding};
use html5ever::tokenizer;
use html5ever::tree_builder;
use html5ever::tree_builder::{NodeOrText, TreeBuilder, TreeBuilderOpts};
use html5ever::tree_builder::{TreeBuilder, TreeBuilderOpts};
use hyper::header::ContentType;
use hyper::mime::{Mime, SubLevel, TopLevel};
use js::jsapi::JSTracer;
@ -36,7 +35,6 @@ use std::cell::UnsafeCell;
use std::default::Default;
use std::ptr;
use url::Url;
use util::str::DOMString;
#[must_root]
#[derive(JSTraceable, HeapSizeOf)]
@ -45,21 +43,6 @@ pub struct Sink {
pub document: JS<Document>,
}
impl Sink {
#[allow(unrooted_must_root)] // method is only run at parse time
pub fn get_or_create(&self, child: NodeOrText<JS<Node>>) -> Root<Node> {
match child {
NodeOrText::AppendNode(n) => Root::from_ref(&*n),
NodeOrText::AppendText(t) => {
// FIXME(ajeffrey): convert directly from tendrils to DOMStrings
let s: String = t.into();
let text = Text::new(DOMString::from(s), &self.document);
Root::upcast(text)
}
}
}
}
/// FragmentContext is used only to pass this group of related values
/// into functions.
#[derive(Copy, Clone)]

17
components/script/dom/servoxmlparser.rs
View file

@ -11,7 +11,6 @@ use dom::bindings::trace::JSTraceable;
use dom::document::Document;
use dom::node::Node;
use dom::servohtmlparser::ParserRef;
use dom::text::Text;
use dom::window::Window;
use js::jsapi::JSTracer;
use msg::constellation_msg::PipelineId;
@ -19,9 +18,8 @@ use parse::Parser;
use script_task::ScriptTask;
use std::cell::Cell;
use url::Url;
use util::str::DOMString;
use xml5ever::tokenizer;
use xml5ever::tree_builder::{self, NodeOrText, XmlTreeBuilder};
use xml5ever::tree_builder::{self, XmlTreeBuilder};
pub type Tokenizer = tokenizer::XmlTokenizer<XmlTreeBuilder<JS<Node>, Sink>>;
@ -32,19 +30,6 @@ pub struct Sink {
pub document: JS<Document>,
}
impl Sink {
#[allow(unrooted_must_root)] // method is only run at parse time
pub fn get_or_create(&self, child: NodeOrText<JS<Node>>) -> Root<Node> {
match child {
NodeOrText::AppendNode(n) => Root::from_ref(&*n),
NodeOrText::AppendText(t) => {
let s: String = t.into();
let text = Text::new(DOMString::from(s), &self.document);
Root::upcast(text)
}
}
}
}
#[must_root]
#[dom_struct]
pub struct ServoXMLParser {