mirror of
https://github.com/servo/servo.git
synced 2025-08-05 05:30:08 +01:00
Update html5ever to 0.8
This commit is contained in:
Anthony Ramine
parent
5005d36b0e
commit
7cb0955706
5 changed files with 65 additions and 24 deletions
|
|
@ -36,7 +36,7 @@ fnv = "1.0"
|
|||
gfx_traits = {path = "../gfx_traits"}
|
||||
heapsize = "0.3.6"
|
||||
heapsize_derive = "0.1"
|
||||
html5ever = {version = "0.5.1", features = ["heap_size", "unstable"]}
|
||||
html5ever = {version = "0.8.0", features = ["heap_size", "unstable"]}
|
||||
hyper = "0.9.9"
|
||||
hyper_serde = "0.1.4"
|
||||
image = "0.10"
|
||||
|
|
|
|||
|
|
@ -29,14 +29,14 @@ use html5ever::serialize::{AttrRef, Serializable, Serializer};
|
|||
use html5ever::serialize::TraversalScope;
|
||||
use html5ever::serialize::TraversalScope::{ChildrenOnly, IncludeNode};
|
||||
use html5ever::tendril::StrTendril;
|
||||
use html5ever::tokenizer::{Tokenizer as HtmlTokenizer, TokenizerOpts};
|
||||
use html5ever::tokenizer::{Tokenizer as H5ETokenizer, TokenizerOpts};
|
||||
use html5ever::tree_builder::{NextParserState, NodeOrText, QuirksMode};
|
||||
use html5ever::tree_builder::{TreeBuilder, TreeBuilderOpts, TreeSink};
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use std::borrow::Cow;
|
||||
use std::io::{self, Write};
|
||||
use string_cache::QualName;
|
||||
use super::{LastChunkState, ServoParser, Sink, Tokenizer};
|
||||
use super::{HtmlTokenizer, LastChunkState, ServoParser, Sink, Tokenizer};
|
||||
use url::Url;
|
||||
|
||||
fn insert(parent: &Node, reference_child: Option<&Node>, child: NodeOrText<JS<Node>>) {
|
||||
|
|
@ -276,10 +276,13 @@ pub fn parse_html(document: &Document,
|
|||
let parser = match context {
|
||||
ParseContext::Owner(owner) => {
|
||||
let tb = TreeBuilder::new(sink, options);
|
||||
let tok = HtmlTokenizer::new(tb, Default::default());
|
||||
let tok = H5ETokenizer::new(tb, Default::default());
|
||||
|
||||
ServoParser::new(
|
||||
document, owner, Tokenizer::HTML(tok), LastChunkState::NotReceived)
|
||||
document,
|
||||
owner,
|
||||
Tokenizer::HTML(HtmlTokenizer::new(tok)),
|
||||
LastChunkState::NotReceived)
|
||||
},
|
||||
ParseContext::Fragment(fc) => {
|
||||
let tb = TreeBuilder::new_for_fragment(
|
||||
|
|
@ -292,10 +295,13 @@ pub fn parse_html(document: &Document,
|
|||
initial_state: Some(tb.tokenizer_state_for_context_elem()),
|
||||
.. Default::default()
|
||||
};
|
||||
let tok = HtmlTokenizer::new(tb, tok_options);
|
||||
let tok = H5ETokenizer::new(tb, tok_options);
|
||||
|
||||
ServoParser::new(
|
||||
document, None, Tokenizer::HTML(tok), LastChunkState::Received)
|
||||
document,
|
||||
None,
|
||||
Tokenizer::HTML(HtmlTokenizer::new(tok)),
|
||||
LastChunkState::Received)
|
||||
}
|
||||
};
|
||||
parser.parse_chunk(String::from(input));
|
||||
|
|
|
|||
|
|
@ -20,7 +20,8 @@ use dom::htmlimageelement::HTMLImageElement;
|
|||
use dom::node::Node;
|
||||
use encoding::all::UTF_8;
|
||||
use encoding::types::{DecoderTrap, Encoding};
|
||||
use html5ever::tokenizer::Tokenizer as HtmlTokenizer;
|
||||
use html5ever::tokenizer::Tokenizer as H5ETokenizer;
|
||||
use html5ever::tokenizer::buffer_queue::BufferQueue;
|
||||
use html5ever::tree_builder::Tracer as HtmlTracer;
|
||||
use html5ever::tree_builder::TreeBuilder as HtmlTreeBuilder;
|
||||
use hyper::header::ContentType;
|
||||
|
|
@ -136,10 +137,6 @@ impl ServoParser {
|
|||
self.tokenizer.borrow_mut().set_plaintext_state()
|
||||
}
|
||||
|
||||
pub fn end_tokenizer(&self) {
|
||||
self.tokenizer.borrow_mut().end()
|
||||
}
|
||||
|
||||
pub fn suspend(&self) {
|
||||
assert!(!self.suspended.get());
|
||||
self.suspended.set(true);
|
||||
|
|
@ -220,16 +217,50 @@ impl ServoParser {
|
|||
#[derive(HeapSizeOf)]
|
||||
#[must_root]
|
||||
enum Tokenizer {
|
||||
HTML(
|
||||
#[ignore_heap_size_of = "Defined in html5ever"]
|
||||
HtmlTokenizer<HtmlTreeBuilder<JS<Node>, Sink>>
|
||||
),
|
||||
HTML(HtmlTokenizer),
|
||||
XML(
|
||||
#[ignore_heap_size_of = "Defined in xml5ever"]
|
||||
XmlTokenizer<XmlTreeBuilder<JS<Node>, Sink>>
|
||||
),
|
||||
}
|
||||
|
||||
#[derive(HeapSizeOf)]
|
||||
#[must_root]
|
||||
struct HtmlTokenizer {
|
||||
#[ignore_heap_size_of = "Defined in html5ever"]
|
||||
inner: H5ETokenizer<HtmlTreeBuilder<JS<Node>, Sink>>,
|
||||
#[ignore_heap_size_of = "Defined in html5ever"]
|
||||
input_buffer: BufferQueue,
|
||||
}
|
||||
|
||||
impl HtmlTokenizer {
|
||||
#[allow(unrooted_must_root)]
|
||||
fn new(inner: H5ETokenizer<HtmlTreeBuilder<JS<Node>, Sink>>) -> Self {
|
||||
HtmlTokenizer {
|
||||
inner: inner,
|
||||
input_buffer: BufferQueue::new(),
|
||||
}
|
||||
}
|
||||
|
||||
fn feed(&mut self, input: String) {
|
||||
self.input_buffer.push_back(input.into());
|
||||
self.run();
|
||||
}
|
||||
|
||||
fn run(&mut self) {
|
||||
self.inner.feed(&mut self.input_buffer);
|
||||
}
|
||||
|
||||
fn end(&mut self) {
|
||||
assert!(self.input_buffer.is_empty());
|
||||
self.inner.end();
|
||||
}
|
||||
|
||||
fn set_plaintext_state(&mut self) {
|
||||
self.inner.set_plaintext_state();
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(JSTraceable, HeapSizeOf)]
|
||||
#[must_root]
|
||||
struct Sink {
|
||||
|
|
@ -240,7 +271,7 @@ struct Sink {
|
|||
impl Tokenizer {
|
||||
fn feed(&mut self, input: String) {
|
||||
match *self {
|
||||
Tokenizer::HTML(ref mut tokenizer) => tokenizer.feed(input.into()),
|
||||
Tokenizer::HTML(ref mut tokenizer) => tokenizer.feed(input),
|
||||
Tokenizer::XML(ref mut tokenizer) => tokenizer.feed(input.into()),
|
||||
}
|
||||
}
|
||||
|
|
@ -288,7 +319,7 @@ impl JSTraceable for Tokenizer {
|
|||
node.trace(self.0);
|
||||
}
|
||||
}
|
||||
let tree_builder = tokenizer.sink();
|
||||
let tree_builder = tokenizer.inner.sink();
|
||||
tree_builder.trace_handles(&tracer);
|
||||
tree_builder.sink().trace(trc);
|
||||
},
|
||||
|
|
|
|||
8
components/servo/Cargo.lock
generated
8
components/servo/Cargo.lock
generated
|
|
@ -971,7 +971,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "html5ever"
|
||||
version = "0.5.5"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -980,8 +980,10 @@ dependencies = [
|
|||
"mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"phf 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"phf_codegen 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"quote 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syn 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
|
|
@ -1973,7 +1975,7 @@ dependencies = [
|
|||
"gfx_traits 0.0.1",
|
||||
"heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"html5ever 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"html5ever 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"image 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -2908,7 +2910,7 @@ dependencies = [
|
|||
"checksum heartbeats-simple 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78c0810722eacd0bdd3f1f691524bd9900bf8fed1947f6b883c10ddecd2560b1"
|
||||
"checksum heartbeats-simple-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53c4b67617665d7f4172f381f9843c1bec6a4fccc9a9226529e5b1be40dc1301"
|
||||
"checksum hpack 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d2da7d3a34cf6406d9d700111b8eafafe9a251de41ae71d8052748259343b58"
|
||||
"checksum html5ever 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "91cb2a55a080da050d202eced2df684f1617b7bcfcd141abbe207fcdc572e18a"
|
||||
"checksum html5ever 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74d996f271e5698e3eeae29754d59b2288973e20b898b53899ac7411356a0742"
|
||||
"checksum httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46534074dbb80b070d60a5cb8ecadd8963a00a438ae1a95268850a7ef73b67ae"
|
||||
"checksum hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "eb27e8a3e8f17ac43ffa41bbda9cf5ad3f9f13ef66fa4873409d4902310275f7"
|
||||
"checksum hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "572d2168173019de312a050a24f2ad33ac2ac7895a2139fbf21ee6b6f470a24e"
|
||||
|
|
|
|||
8
ports/cef/Cargo.lock
generated
8
ports/cef/Cargo.lock
generated
|
|
@ -878,7 +878,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "html5ever"
|
||||
version = "0.5.5"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -887,8 +887,10 @@ dependencies = [
|
|||
"mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"phf 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"phf_codegen 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"quote 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syn 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
|
|
@ -1824,7 +1826,7 @@ dependencies = [
|
|||
"gfx_traits 0.0.1",
|
||||
"heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"heapsize_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"html5ever 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"html5ever 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"image 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -2760,7 +2762,7 @@ dependencies = [
|
|||
"checksum heartbeats-simple 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78c0810722eacd0bdd3f1f691524bd9900bf8fed1947f6b883c10ddecd2560b1"
|
||||
"checksum heartbeats-simple-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53c4b67617665d7f4172f381f9843c1bec6a4fccc9a9226529e5b1be40dc1301"
|
||||
"checksum hpack 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d2da7d3a34cf6406d9d700111b8eafafe9a251de41ae71d8052748259343b58"
|
||||
"checksum html5ever 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "91cb2a55a080da050d202eced2df684f1617b7bcfcd141abbe207fcdc572e18a"
|
||||
"checksum html5ever 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74d996f271e5698e3eeae29754d59b2288973e20b898b53899ac7411356a0742"
|
||||
"checksum httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46534074dbb80b070d60a5cb8ecadd8963a00a438ae1a95268850a7ef73b67ae"
|
||||
"checksum hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "eb27e8a3e8f17ac43ffa41bbda9cf5ad3f9f13ef66fa4873409d4902310275f7"
|
||||
"checksum hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "572d2168173019de312a050a24f2ad33ac2ac7895a2139fbf21ee6b6f470a24e"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue