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

Make ServoParser::pending_input hold onto a BufferQueue

Browse source
This commit is contained in:
Anthony Ramine 2016-11-16 16:28:30 +01:00
parent 22aebdf5d4
commit a3da819d10
7 changed files with 68 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/Cargo.toml
View file

@ -37,7 +37,7 @@ fnv = "1.0"
gfx_traits = {path = "../gfx_traits"} gfx_traits = {path = "../gfx_traits"}
heapsize = "0.3.6" heapsize = "0.3.6"
heapsize_derive = "0.1" heapsize_derive = "0.1"
html5ever = {version = "0.10.1", features = ["heap_size", "unstable"]} html5ever = {version = "0.10.2", features = ["heap_size", "unstable"]}
html5ever-atoms = {version = "0.1", features = ["heap_size"]} html5ever-atoms = {version = "0.1", features = ["heap_size"]}
hyper = "0.9.9" hyper = "0.9.9"
hyper_serde = "0.1.4" hyper_serde = "0.1.4"

6
components/script/dom/bindings/js.rs
View file

@ -408,6 +408,12 @@ impl<T: Reflectable> MutNullableHeap<JS<T>> {
} }
} }
/// Gets the current value out of this object and sets it to `None`.
pub fn take(&self) -> Option<Root<T>> {
let value = self.get();
self.set(None);
value
}
} }
impl<T: Reflectable> PartialEq for MutNullableHeap<JS<T>> { impl<T: Reflectable> PartialEq for MutNullableHeap<JS<T>> {

30
components/script/dom/servoparser/html.rs
View file

@ -34,22 +34,19 @@ use js::jsapi::JSTracer;
use servo_url::ServoUrl; use servo_url::ServoUrl;
use std::borrow::Cow; use std::borrow::Cow;
use std::io::{self, Write}; use std::io::{self, Write};
use super::{FragmentContext, Sink};
#[derive(HeapSizeOf, JSTraceable)] #[derive(HeapSizeOf, JSTraceable)]
#[must_root] #[must_root]
pub struct Tokenizer { pub struct Tokenizer {
#[ignore_heap_size_of = "Defined in html5ever"] #[ignore_heap_size_of = "Defined in html5ever"]
inner: HtmlTokenizer<TreeBuilder<JS<Node>, Sink>>, inner: HtmlTokenizer<TreeBuilder<JS<Node>, Sink>>,
#[ignore_heap_size_of = "Defined in html5ever"]
input_buffer: BufferQueue,
} }
impl Tokenizer { impl Tokenizer {
pub fn new( pub fn new(
document: &Document, document: &Document,
url: ServoUrl, url: ServoUrl,
fragment_context: Option<FragmentContext>) fragment_context: Option<super::FragmentContext>)
-> Self { -> Self {
let sink = Sink { let sink = Sink {
base_url: url, base_url: url,
@ -80,27 +77,17 @@ impl Tokenizer {
Tokenizer { Tokenizer {
inner: inner, inner: inner,
input_buffer: BufferQueue::new(),
} }
} }
pub fn feed(&mut self, input: String) { pub fn feed(&mut self, input: &mut BufferQueue) -> Result<(), Root<HTMLScriptElement>> {
self.input_buffer.push_back(input.into()); match self.inner.feed(input) {
self.run(); TokenizerResult::Done => Ok(()),
} TokenizerResult::Script(script) => Err(Root::from_ref(script.downcast().unwrap())),
#[allow(unrooted_must_root)]
pub fn run(&mut self) {
while let TokenizerResult::Script(script) = self.inner.feed(&mut self.input_buffer) {
let script = Root::from_ref(script.downcast::<HTMLScriptElement>().unwrap());
if !script.prepare() {
break;
}
} }
} }
pub fn end(&mut self) { pub fn end(&mut self) {
assert!(self.input_buffer.is_empty());
self.inner.end(); self.inner.end();
} }
@ -128,6 +115,13 @@ impl JSTraceable for HtmlTokenizer<TreeBuilder<JS<Node>, Sink>> {
} }
} }
#[derive(JSTraceable, HeapSizeOf)]
#[must_root]
struct Sink {
base_url: ServoUrl,
document: JS<Document>,
}
impl<'a> TreeSink for Sink { impl<'a> TreeSink for Sink {
type Output = Self; type Output = Self;
fn finish(self) -> Self { self } fn finish(self) -> Self { self }

45
components/script/dom/servoparser/mod.rs
View file

@ -17,9 +17,11 @@ use dom::document::{Document, DocumentSource, IsHTMLDocument};
use dom::globalscope::GlobalScope; use dom::globalscope::GlobalScope;
use dom::htmlformelement::HTMLFormElement; use dom::htmlformelement::HTMLFormElement;
use dom::htmlimageelement::HTMLImageElement; use dom::htmlimageelement::HTMLImageElement;
use dom::htmlscriptelement::HTMLScriptElement;
use dom::node::{Node, document_from_node, window_from_node}; use dom::node::{Node, document_from_node, window_from_node};
use encoding::all::UTF_8; use encoding::all::UTF_8;
use encoding::types::{DecoderTrap, Encoding}; use encoding::types::{DecoderTrap, Encoding};
use html5ever::tokenizer::buffer_queue::BufferQueue;
use hyper::header::ContentType; use hyper::header::ContentType;
use hyper::mime::{Mime, SubLevel, TopLevel}; use hyper::mime::{Mime, SubLevel, TopLevel};
use hyper_serde::Serde; use hyper_serde::Serde;
@ -31,7 +33,6 @@ use profile_traits::time::{TimerMetadataReflowType, ProfilerCategory, profile};
use script_thread::ScriptThread; use script_thread::ScriptThread;
use servo_url::ServoUrl; use servo_url::ServoUrl;
use std::cell::Cell; use std::cell::Cell;
use std::collections::VecDeque;
use util::resource_files::read_resource_file; use util::resource_files::read_resource_file;
mod html; mod html;
@ -46,7 +47,8 @@ pub struct ServoParser {
/// does not correspond to a page load. /// does not correspond to a page load.
pipeline: Option<PipelineId>, pipeline: Option<PipelineId>,
/// Input chunks received but not yet passed to the parser. /// Input chunks received but not yet passed to the parser.
pending_input: DOMRefCell<VecDeque<String>>, #[ignore_heap_size_of = "Defined in html5ever"]
pending_input: DOMRefCell<BufferQueue>,
/// The tokenizer of this parser. /// The tokenizer of this parser.
tokenizer: DOMRefCell<Tokenizer>, tokenizer: DOMRefCell<Tokenizer>,
/// Whether to expect any further input from the associated network request. /// Whether to expect any further input from the associated network request.
@ -143,7 +145,7 @@ impl ServoParser {
reflector: Reflector::new(), reflector: Reflector::new(),
document: JS::from_ref(document), document: JS::from_ref(document),
pipeline: pipeline, pipeline: pipeline,
pending_input: DOMRefCell::new(VecDeque::new()), pending_input: DOMRefCell::new(BufferQueue::new()),
tokenizer: DOMRefCell::new(tokenizer), tokenizer: DOMRefCell::new(tokenizer),
last_chunk_received: Cell::new(last_chunk_state == LastChunkState::Received), last_chunk_received: Cell::new(last_chunk_state == LastChunkState::Received),
suspended: Default::default(), suspended: Default::default(),
@ -176,16 +178,7 @@ impl ServoParser {
} }
fn push_input_chunk(&self, chunk: String) { fn push_input_chunk(&self, chunk: String) {
self.pending_input.borrow_mut().push_back(chunk); self.pending_input.borrow_mut().push_back(chunk.into());
}
fn take_next_input_chunk(&self) -> Option<String> {
let mut pending_input = self.pending_input.borrow_mut();
if pending_input.is_empty() {
None
} else {
pending_input.pop_front()
}
} }
fn last_chunk_received(&self) -> bool { fn last_chunk_received(&self) -> bool {
@ -233,10 +226,10 @@ impl ServoParser {
// the parser remains unsuspended. // the parser remains unsuspended.
loop { loop {
self.document().reflow_if_reflow_timer_expired(); self.document().reflow_if_reflow_timer_expired();
if let Some(chunk) = self.take_next_input_chunk() { if let Err(script) = self.tokenizer.borrow_mut().feed(&mut *self.pending_input.borrow_mut()) {
self.tokenizer.borrow_mut().feed(chunk); if script.prepare() {
} else { continue;
self.tokenizer.borrow_mut().run(); }
} }
// Document parsing is blocked on an external resource. // Document parsing is blocked on an external resource.
@ -284,25 +277,11 @@ enum Tokenizer {
Xml(self::xml::Tokenizer), Xml(self::xml::Tokenizer),
} }
#[derive(JSTraceable, HeapSizeOf)]
#[must_root]
struct Sink {
pub base_url: ServoUrl,
pub document: JS<Document>,
}
impl Tokenizer { impl Tokenizer {
fn feed(&mut self, input: String) { fn feed(&mut self, input: &mut BufferQueue) -> Result<(), Root<HTMLScriptElement>> {
match *self { match *self {
Tokenizer::Html(ref mut tokenizer) => tokenizer.feed(input), Tokenizer::Html(ref mut tokenizer) => tokenizer.feed(input),
Tokenizer::Xml(ref mut tokenizer) => tokenizer.feed(input.into()), Tokenizer::Xml(ref mut tokenizer) => tokenizer.feed(input),
}
}
fn run(&mut self) {
match *self {
Tokenizer::Html(ref mut tokenizer) => tokenizer.run(),
Tokenizer::Xml(ref mut tokenizer) => tokenizer.run(),
} }
} }

46
components/script/dom/servoparser/xml.rs
View file

@ -6,7 +6,7 @@
use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
use dom::bindings::inheritance::Castable; use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, Root}; use dom::bindings::js::{JS, MutNullableHeap, Root};
use dom::bindings::str::DOMString; use dom::bindings::str::DOMString;
use dom::bindings::trace::JSTraceable; use dom::bindings::trace::JSTraceable;
use dom::comment::Comment; use dom::comment::Comment;
@ -17,11 +17,11 @@ use dom::htmlscriptelement::HTMLScriptElement;
use dom::node::Node; use dom::node::Node;
use dom::processinginstruction::ProcessingInstruction; use dom::processinginstruction::ProcessingInstruction;
use dom::text::Text; use dom::text::Text;
use html5ever::tokenizer::buffer_queue::BufferQueue;
use html5ever_atoms::{Prefix, QualName}; use html5ever_atoms::{Prefix, QualName};
use js::jsapi::JSTracer; use js::jsapi::JSTracer;
use servo_url::ServoUrl; use servo_url::ServoUrl;
use std::borrow::Cow; use std::borrow::Cow;
use super::Sink;
use xml5ever::tendril::StrTendril; use xml5ever::tendril::StrTendril;
use xml5ever::tokenizer::{Attribute, QName, XmlTokenizer}; use xml5ever::tokenizer::{Attribute, QName, XmlTokenizer};
use xml5ever::tree_builder::{NextParserState, NodeOrText}; use xml5ever::tree_builder::{NextParserState, NodeOrText};
@ -39,6 +39,7 @@ impl Tokenizer {
let sink = Sink { let sink = Sink {
base_url: url, base_url: url,
document: JS::from_ref(document), document: JS::from_ref(document),
script: Default::default(),
}; };
let tb = XmlTreeBuilder::new(sink); let tb = XmlTreeBuilder::new(sink);
@ -49,12 +50,21 @@ impl Tokenizer {
} }
} }
pub fn feed(&mut self, input: String) { pub fn feed(&mut self, input: &mut BufferQueue) -> Result<(), Root<HTMLScriptElement>> {
self.inner.feed(input.into()) if !input.is_empty() {
} while let Some(chunk) = input.pop_front() {
self.inner.feed(chunk);
pub fn run(&mut self) { if let Some(script) = self.inner.sink().sink().script.take() {
self.inner.run() return Err(script);
}
}
} else {
self.inner.run();
if let Some(script) = self.inner.sink().sink().script.take() {
return Err(script);
}
}
Ok(())
} }
pub fn end(&mut self) { pub fn end(&mut self) {
@ -81,6 +91,14 @@ impl JSTraceable for XmlTokenizer<XmlTreeBuilder<JS<Node>, Sink>> {
} }
} }
#[derive(JSTraceable, HeapSizeOf)]
#[must_root]
struct Sink {
base_url: ServoUrl,
document: JS<Document>,
script: MutNullableHeap<JS<HTMLScriptElement>>,
}
impl<'a> TreeSink for Sink { impl<'a> TreeSink for Sink {
type Handle = JS<Node>; type Handle = JS<Node>;
@ -165,13 +183,11 @@ impl<'a> TreeSink for Sink {
} }
fn complete_script(&mut self, node: Self::Handle) -> NextParserState { fn complete_script(&mut self, node: Self::Handle) -> NextParserState {
let script = node.downcast::<HTMLScriptElement>(); if let Some(script) = node.downcast() {
if let Some(script) = script { self.script.set(Some(script));
return match script.prepare() { NextParserState::Suspend
true => NextParserState::Continue, } else {
false => NextParserState::Suspend, NextParserState::Continue
};
} }
NextParserState::Continue
} }
} }

6
ports/cef/Cargo.lock generated
View file

@ -942,7 +942,7 @@ dependencies = [
[[package]] [[package]]
name = "html5ever" name = "html5ever"
version = "0.10.1" version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1990,7 +1990,7 @@ dependencies = [
"gfx_traits 0.0.1", "gfx_traits 0.0.1",
"heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"html5ever 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
"html5ever-atoms 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever-atoms 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3010,7 +3010,7 @@ dependencies = [
"checksum heartbeats-simple 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78c0810722eacd0bdd3f1f691524bd9900bf8fed1947f6b883c10ddecd2560b1" "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 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 hpack 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d2da7d3a34cf6406d9d700111b8eafafe9a251de41ae71d8052748259343b58"
"checksum html5ever 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "47e8b18bb73cb3535597d23fbd1998fb45fe88cb12b9acf183a0188331f6d915" "checksum html5ever 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9464c43c1b84b1e31c10636e6bc85f63eb7cb435a757020a8e1d1a5502254d4c"
"checksum html5ever-atoms 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "daefa106438c66af58309c84842b5db1df2733fe35849f39adde6fdf63583d40" "checksum html5ever-atoms 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "daefa106438c66af58309c84842b5db1df2733fe35849f39adde6fdf63583d40"
"checksum httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46534074dbb80b070d60a5cb8ecadd8963a00a438ae1a95268850a7ef73b67ae" "checksum httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46534074dbb80b070d60a5cb8ecadd8963a00a438ae1a95268850a7ef73b67ae"
"checksum hyper 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)" = "edd47c66782933e546a32ae89ca3c49263b2ba9bc29f3a0d5c52fff48e0ac67c" "checksum hyper 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)" = "edd47c66782933e546a32ae89ca3c49263b2ba9bc29f3a0d5c52fff48e0ac67c"

6
ports/servo/Cargo.lock generated
View file

@ -1021,7 +1021,7 @@ dependencies = [
[[package]] [[package]]
name = "html5ever" name = "html5ever"
version = "0.10.1" version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2140,7 +2140,7 @@ dependencies = [
"gfx_traits 0.0.1", "gfx_traits 0.0.1",
"heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"html5ever 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
"html5ever-atoms 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever-atoms 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3218,7 +3218,7 @@ dependencies = [
"checksum heartbeats-simple 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78c0810722eacd0bdd3f1f691524bd9900bf8fed1947f6b883c10ddecd2560b1" "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 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 hpack 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d2da7d3a34cf6406d9d700111b8eafafe9a251de41ae71d8052748259343b58"
"checksum html5ever 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "47e8b18bb73cb3535597d23fbd1998fb45fe88cb12b9acf183a0188331f6d915" "checksum html5ever 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9464c43c1b84b1e31c10636e6bc85f63eb7cb435a757020a8e1d1a5502254d4c"
"checksum html5ever-atoms 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "daefa106438c66af58309c84842b5db1df2733fe35849f39adde6fdf63583d40" "checksum html5ever-atoms 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "daefa106438c66af58309c84842b5db1df2733fe35849f39adde6fdf63583d40"
"checksum httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46534074dbb80b070d60a5cb8ecadd8963a00a438ae1a95268850a7ef73b67ae" "checksum httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46534074dbb80b070d60a5cb8ecadd8963a00a438ae1a95268850a7ef73b67ae"
"checksum hyper 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)" = "edd47c66782933e546a32ae89ca3c49263b2ba9bc29f3a0d5c52fff48e0ac67c" "checksum hyper 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)" = "edd47c66782933e546a32ae89ca3c49263b2ba9bc29f3a0d5c52fff48e0ac67c"