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

Improve spec-compliance of script loading and execution during document startup

Browse source 
Including proper support for async and deferred scripts.
This commit is contained in:
Till Schneidereit 2015-10-12 16:03:42 +02:00
parent 6b95c3957b
commit a0c5d47910
9 changed files with 298 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -159,7 +159,9 @@ impl AsyncResponseListener for ParserContext {
}
parser.r().last_chunk_received.set(true);
parser.r().parse_sync();
if !parser.r().is_suspended() {
parser.r().parse_sync();
}
}
}
@ -188,7 +190,9 @@ impl<'a> Parser for &'a ServoHTMLParser {
fn parse_chunk(self, input: String) {
self.document.set_current_parser(Some(self));
self.pending_input.borrow_mut().push(input);
self.parse_sync();
if !self.is_suspended() {
self.parse_sync();
}
}
fn finish(self) {
@ -282,21 +286,10 @@ impl ServoHTMLParser {
impl ServoHTMLParser {
fn parse_sync(&self) {
let mut first = true;
// This parser will continue to parse while there is either pending input or
// the parser remains unsuspended.
loop {
if self.suspended.get() {
return;
}
if self.pending_input.borrow().is_empty() && !first {
break;
}
self.document.reflow_if_reflow_timer_expired();
self.document.reflow_if_reflow_timer_expired();
let mut pending_input = self.pending_input.borrow_mut();
if !pending_input.is_empty() {
let chunk = pending_input.remove(0);
@ -305,7 +298,14 @@ impl ServoHTMLParser {
self.tokenizer.borrow_mut().run();
}
first = false;
// Document parsing is blocked on an external resource.
if self.suspended.get() {
return;
}
if pending_input.is_empty() {
break;
}
}
if self.last_chunk_received.get() {
@ -330,6 +330,10 @@ impl ServoHTMLParser {
self.suspended.set(false);
self.parse_sync();
}
pub fn is_suspended(&self) -> bool {
self.suspended.get()
}
}
struct Tracer {