aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/htmlscriptelement.rs140
-rw-r--r--components/script/dom/servoparser/html.rs23
-rw-r--r--components/script/dom/servoparser/mod.rs20
-rw-r--r--components/script/dom/servoparser/xml.rs12
-rw-r--r--components/script/dom/urlhelper.rs3
5 files changed, 100 insertions, 98 deletions
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index 9c2bcfd583c..f2eb73123fd 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -40,6 +40,7 @@ use std::ascii::AsciiExt;
use std::cell::Cell;
use std::sync::{Arc, Mutex};
use style::str::{HTML_SPACE_CHARACTERS, StaticStringVec};
+
#[dom_struct]
pub struct HTMLScriptElement {
htmlelement: HTMLElement,
@@ -364,9 +365,11 @@ impl HTMLScriptElement {
_ => unreachable!()
};
- // TODO: Step 15: Nonce.
+ // TODO: Step 15: Module script credentials mode.
+
+ // TODO: Step 16: Nonce.
- // Step 16: Integrity Metadata
+ // Step 17: Integrity metadata.
let im_attribute = element.get_attribute(&ns!(), &local_name!("integrity"));
let integrity_val = im_attribute.r().map(|a| a.value());
let integrity_metadata = match integrity_val {
@@ -374,79 +377,76 @@ impl HTMLScriptElement {
None => "",
};
- // TODO: Step 17: environment settings object.
+ // TODO: Step 18: parser state.
+
+ // TODO: Step 19: environment settings object.
let base_url = doc.base_url();
- let is_external = match element.get_attribute(&ns!(), &local_name!("src")) {
- // Step 18.
- Some(ref src) => {
- // Step 18.1.
- let src = src.value();
-
- // Step 18.2.
- if src.is_empty() {
- self.queue_error_event();
- return;
- }
+ if let Some(src) = element.get_attribute(&ns!(), &local_name!("src")) {
+ // Step 20.
- // Step 18.4-18.5.
- let url = match base_url.join(&src) {
- Err(_) => {
- warn!("error parsing URL for script {}", &**src);
- self.queue_error_event();
- return;
- }
- Ok(url) => url,
- };
+ // Step 20.1.
+ let src = src.value();
- // Step 18.6.
- fetch_a_classic_script(self, url, cors_setting, integrity_metadata.to_owned(), encoding);
+ // Step 20.2.
+ if src.is_empty() {
+ self.queue_error_event();
+ return;
+ }
- true
- },
- // TODO: Step 19.
- None => false,
- };
+ // Step 20.3: The "from an external file"" flag is stored in ScriptOrigin.
- // Step 20.
- let deferred = element.has_attribute(&local_name!("defer"));
- // Step 20.a: classic, has src, has defer, was parser-inserted, is not async.
- if is_external &&
- deferred &&
- was_parser_inserted &&
- !async {
- doc.add_deferred_script(self);
- // Second part implemented in Document::process_deferred_scripts.
- // Step 20.b: classic, has src, was parser-inserted, is not async.
- } else if is_external &&
- was_parser_inserted &&
- !async {
- doc.set_pending_parsing_blocking_script(Some(self));
- // Second part implemented in the load result handler.
- // Step 20.c: classic, has src, isn't async, isn't non-blocking.
- } else if is_external &&
- !async &&
- !self.non_blocking.get() {
- doc.push_asap_in_order_script(self);
- // Second part implemented in Document::process_asap_scripts.
- // Step 20.d: classic, has src.
- } else if is_external {
- doc.add_asap_script(self);
- // Second part implemented in Document::process_asap_scripts.
- // Step 20.e: doesn't have src, was parser-inserted, is blocked on stylesheet.
- } else if !is_external &&
- was_parser_inserted &&
- doc.get_current_parser().map_or(false, |parser| parser.script_nesting_level() <= 1) &&
- doc.get_script_blocking_stylesheets_count() > 0 {
- doc.set_pending_parsing_blocking_script(Some(self));
- *self.load.borrow_mut() = Some(Ok(ScriptOrigin::internal(text, base_url)));
- self.ready_to_be_parser_executed.set(true);
- // Step 20.f: otherwise.
+ // Step 20.4-20.5.
+ let url = match base_url.join(&src) {
+ Ok(url) => url,
+ Err(_) => {
+ warn!("error parsing URL for script {}", &**src);
+ self.queue_error_event();
+ return;
+ },
+ };
+
+ // Preparation for step 22.
+ let kind = if element.has_attribute(&local_name!("defer")) && was_parser_inserted && !async {
+ // Step 22.a: classic, has src, has defer, was parser-inserted, is not async.
+ ExternalScriptKind::Deferred
+ } else if was_parser_inserted && !async {
+ // Step 22.b: classic, has src, was parser-inserted, is not async.
+ ExternalScriptKind::ParsingBlocking
+ } else if !async && !self.non_blocking.get() {
+ // Step 22.c: classic, has src, is not async, is not non-blocking.
+ ExternalScriptKind::AsapInOrder
+ } else {
+ // Step 22.d: classic, has src.
+ ExternalScriptKind::Asap
+ };
+
+ // Step 20.6.
+ fetch_a_classic_script(self, url, cors_setting, integrity_metadata.to_owned(), encoding);
+
+ // Step 22.
+ match kind {
+ ExternalScriptKind::Deferred => doc.add_deferred_script(self),
+ ExternalScriptKind::ParsingBlocking => doc.set_pending_parsing_blocking_script(Some(self)),
+ ExternalScriptKind::AsapInOrder => doc.push_asap_in_order_script(self),
+ ExternalScriptKind::Asap => doc.add_asap_script(self),
+ }
} else {
+ // Step 21.
assert!(!text.is_empty());
- self.ready_to_be_parser_executed.set(true);
*self.load.borrow_mut() = Some(Ok(ScriptOrigin::internal(text, base_url)));
- self.execute();
+ self.ready_to_be_parser_executed.set(true);
+
+ // Step 22.
+ if was_parser_inserted &&
+ doc.get_current_parser().map_or(false, |parser| parser.script_nesting_level() <= 1) &&
+ doc.get_script_blocking_stylesheets_count() > 0 {
+ // Step 22.e: classic, has no src, was parser-inserted, is blocked on stylesheet.
+ doc.set_pending_parsing_blocking_script(Some(self));
+ } else {
+ // Step 22.f: otherwise.
+ self.execute();
+ }
}
}
@@ -733,3 +733,11 @@ impl HTMLScriptElementMethods for HTMLScriptElement {
self.upcast::<Node>().SetTextContent(Some(value))
}
}
+
+#[derive(Clone, Copy)]
+enum ExternalScriptKind {
+ Deferred,
+ ParsingBlocking,
+ AsapInOrder,
+ Asap,
+}
diff --git a/components/script/dom/servoparser/html.rs b/components/script/dom/servoparser/html.rs
index 4a8f01d639e..d4b53175b49 100644
--- a/components/script/dom/servoparser/html.rs
+++ b/components/script/dom/servoparser/html.rs
@@ -19,7 +19,6 @@ use dom::htmlscriptelement::HTMLScriptElement;
use dom::htmltemplateelement::HTMLTemplateElement;
use dom::node::Node;
use dom::processinginstruction::ProcessingInstruction;
-use dom::text::Text;
use dom::virtualmethods::vtable_for;
use html5ever::Attribute;
use html5ever::serialize::{AttrRef, Serializable, Serializer};
@@ -180,7 +179,7 @@ impl TreeSink for Sink {
None => return Err(new_node),
};
- insert(&parent, Some(&*sibling), new_node);
+ super::insert(&parent, Some(&*sibling), new_node);
Ok(())
}
@@ -198,8 +197,7 @@ impl TreeSink for Sink {
}
fn append(&mut self, parent: JS<Node>, child: NodeOrText<JS<Node>>) {
- // FIXME(#3701): Use a simpler algorithm and merge adjacent text nodes
- insert(&parent, None, child);
+ super::insert(&parent, None, child);
}
fn append_doctype_to_document(&mut self, name: StrTendril, public_id: StrTendril,
@@ -242,23 +240,6 @@ impl TreeSink for Sink {
}
}
-fn insert(parent: &Node, reference_child: Option<&Node>, child: NodeOrText<JS<Node>>) {
- match child {
- NodeOrText::AppendNode(n) => {
- assert!(parent.InsertBefore(&n, reference_child).is_ok());
- },
- NodeOrText::AppendText(t) => {
- if let Some(text) = parent.GetLastChild().and_then(Root::downcast::<Text>) {
- text.upcast::<CharacterData>().append_data(&t);
- } else {
- let s: String = t.into();
- let text = Text::new(DOMString::from(s), &parent.owner_doc());
- parent.InsertBefore(text.upcast(), reference_child).unwrap();
- }
- }
- }
-}
-
impl<'a> Serializable for &'a Node {
fn serialize<'wr, Wr: Write>(&self, serializer: &mut Serializer<'wr, Wr>,
traversal_scope: TraversalScope) -> io::Result<()> {
diff --git a/components/script/dom/servoparser/mod.rs b/components/script/dom/servoparser/mod.rs
index 51143ebdbad..2abed929231 100644
--- a/components/script/dom/servoparser/mod.rs
+++ b/components/script/dom/servoparser/mod.rs
@@ -13,6 +13,7 @@ use dom::bindings::js::{JS, Root, RootedReference};
use dom::bindings::refcounted::Trusted;
use dom::bindings::reflector::{Reflector, reflect_dom_object};
use dom::bindings::str::DOMString;
+use dom::characterdata::CharacterData;
use dom::document::{Document, DocumentSource, IsHTMLDocument};
use dom::element::Element;
use dom::globalscope::GlobalScope;
@@ -20,9 +21,11 @@ use dom::htmlformelement::HTMLFormElement;
use dom::htmlimageelement::HTMLImageElement;
use dom::htmlscriptelement::HTMLScriptElement;
use dom::node::{Node, NodeSiblingIterator};
+use dom::text::Text;
use encoding::all::UTF_8;
use encoding::types::{DecoderTrap, Encoding};
use html5ever::tokenizer::buffer_queue::BufferQueue;
+use html5ever::tree_builder::NodeOrText;
use hyper::header::ContentType;
use hyper::mime::{Mime, SubLevel, TopLevel};
use hyper_serde::Serde;
@@ -559,3 +562,20 @@ pub struct FragmentContext<'a> {
pub context_elem: &'a Node,
pub form_elem: Option<&'a Node>,
}
+
+#[allow(unrooted_must_root)]
+fn insert(parent: &Node, reference_child: Option<&Node>, child: NodeOrText<JS<Node>>) {
+ match child {
+ NodeOrText::AppendNode(n) => {
+ parent.InsertBefore(&n, reference_child).unwrap();
+ },
+ NodeOrText::AppendText(t) => {
+ if let Some(text) = parent.GetLastChild().and_then(Root::downcast::<Text>) {
+ text.upcast::<CharacterData>().append_data(&t);
+ } else {
+ let text = Text::new(String::from(t).into(), &parent.owner_doc());
+ parent.InsertBefore(text.upcast(), reference_child).unwrap();
+ }
+ }
+ }
+}
diff --git a/components/script/dom/servoparser/xml.rs b/components/script/dom/servoparser/xml.rs
index 6bab196d7ee..4a62be75cff 100644
--- a/components/script/dom/servoparser/xml.rs
+++ b/components/script/dom/servoparser/xml.rs
@@ -16,9 +16,9 @@ use dom::element::{Element, ElementCreator};
use dom::htmlscriptelement::HTMLScriptElement;
use dom::node::Node;
use dom::processinginstruction::ProcessingInstruction;
-use dom::text::Text;
use dom::virtualmethods::vtable_for;
use html5ever::tokenizer::buffer_queue::BufferQueue;
+use html5ever::tree_builder::{NodeOrText as H5eNodeOrText};
use html5ever_atoms::{Prefix, QualName};
use js::jsapi::JSTracer;
use servo_url::ServoUrl;
@@ -155,14 +155,10 @@ impl TreeSink for Sink {
fn append(&mut self, parent: JS<Node>, child: NodeOrText<JS<Node>>) {
let child = 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)
- }
+ NodeOrText::AppendNode(n) => H5eNodeOrText::AppendNode(n),
+ NodeOrText::AppendText(s) => H5eNodeOrText::AppendText(s),
};
- assert!(parent.AppendChild(&child).is_ok());
+ super::insert(&*parent, None, child);
}
fn append_doctype_to_document(&mut self, name: StrTendril, public_id: StrTendril,
diff --git a/components/script/dom/urlhelper.rs b/components/script/dom/urlhelper.rs
index ec50b4edb71..5037d7fb733 100644
--- a/components/script/dom/urlhelper.rs
+++ b/components/script/dom/urlhelper.rs
@@ -11,9 +11,6 @@ use url::quirks;
pub struct UrlHelper;
impl UrlHelper {
- pub fn SameOrigin(url_a: &ServoUrl, url_b: &ServoUrl) -> bool {
- url_a.origin() == url_b.origin()
- }
pub fn Origin(url: &ServoUrl) -> USVString {
USVString(quirks::origin(url.as_url().unwrap()).to_owned())
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 16:35:45 +0000