mirror of
https://github.com/servo/servo.git
synced 2025-07-22 23:03:42 +01:00
Do not pass an Option to Document::set_pending_parsing_blocking_script
This commit is contained in:
parent
c784bc6944
commit
749ac42854
2 changed files with 5 additions and 5 deletions
|
@ -1450,9 +1450,9 @@ impl Document {
|
||||||
changed
|
changed
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_pending_parsing_blocking_script(&self, script: Option<&HTMLScriptElement>) {
|
pub fn set_pending_parsing_blocking_script(&self, script: &HTMLScriptElement) {
|
||||||
assert!(self.get_pending_parsing_blocking_script().is_none() || script.is_none());
|
assert!(self.get_pending_parsing_blocking_script().is_none());
|
||||||
self.pending_parsing_blocking_script.set(script);
|
self.pending_parsing_blocking_script.set(Some(script));
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_pending_parsing_blocking_script(&self) -> Option<Root<HTMLScriptElement>> {
|
pub fn get_pending_parsing_blocking_script(&self) -> Option<Root<HTMLScriptElement>> {
|
||||||
|
|
|
@ -427,7 +427,7 @@ impl HTMLScriptElement {
|
||||||
// Step 22.
|
// Step 22.
|
||||||
match kind {
|
match kind {
|
||||||
ExternalScriptKind::Deferred => doc.add_deferred_script(self),
|
ExternalScriptKind::Deferred => doc.add_deferred_script(self),
|
||||||
ExternalScriptKind::ParsingBlocking => doc.set_pending_parsing_blocking_script(Some(self)),
|
ExternalScriptKind::ParsingBlocking => doc.set_pending_parsing_blocking_script(self),
|
||||||
ExternalScriptKind::AsapInOrder => doc.push_asap_in_order_script(self),
|
ExternalScriptKind::AsapInOrder => doc.push_asap_in_order_script(self),
|
||||||
ExternalScriptKind::Asap => doc.add_asap_script(self),
|
ExternalScriptKind::Asap => doc.add_asap_script(self),
|
||||||
}
|
}
|
||||||
|
@ -442,7 +442,7 @@ impl HTMLScriptElement {
|
||||||
doc.get_current_parser().map_or(false, |parser| parser.script_nesting_level() <= 1) &&
|
doc.get_current_parser().map_or(false, |parser| parser.script_nesting_level() <= 1) &&
|
||||||
doc.get_script_blocking_stylesheets_count() > 0 {
|
doc.get_script_blocking_stylesheets_count() > 0 {
|
||||||
// Step 22.e: classic, has no src, was parser-inserted, is blocked on stylesheet.
|
// Step 22.e: classic, has no src, was parser-inserted, is blocked on stylesheet.
|
||||||
doc.set_pending_parsing_blocking_script(Some(self));
|
doc.set_pending_parsing_blocking_script(self);
|
||||||
} else {
|
} else {
|
||||||
// Step 22.f: otherwise.
|
// Step 22.f: otherwise.
|
||||||
self.execute();
|
self.execute();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue