From f627b35ef6e40e5a87a2e9173309af75f6322310 Mon Sep 17 00:00:00 2001 From: Tetsuharu OHZEKI Date: Sun, 4 Jan 2015 04:48:09 +0900 Subject: Add the enum to describe the script origin. --- components/script/dom/htmlscriptelement.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'components/script/dom') diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 5d290200b23..5acef40364e 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -112,6 +112,11 @@ static SCRIPT_JS_MIMES: StaticStringVec = &[ "text/x-javascript", ]; +enum ScriptOrigin { + Internal, + External, +} + impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { fn prepare(self) { // https://html.spec.whatwg.org/multipage/scripting.html#prepare-a-script @@ -175,7 +180,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { let page = window.page(); let base_url = page.get_url(); - let (source, url) = match element.get_attribute(ns!(""), &atom!("src")).root() { + let (origin, source, url) = match element.get_attribute(ns!(""), &atom!("src")).root() { Some(src) => { if src.r().Value().is_empty() { // TODO: queue a task to fire a simple event named `error` at the element @@ -191,7 +196,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { Ok((metadata, bytes)) => { // TODO: use the charset from step 13. let source = UTF_8.decode(bytes.as_slice(), DecoderTrap::Replace).unwrap(); - (source, metadata.final_url) + (ScriptOrigin::External, source, metadata.final_url) } Err(_) => { error!("error loading script {}", src.r().Value()); @@ -206,7 +211,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { } } } - None => (text, base_url) + None => (ScriptOrigin::Internal, text, base_url) }; window.evaluate_script_on_global_with_result(source.as_slice(), url.serialize().as_slice()); -- cgit v1.2.3 From b984815b98a22d0453dd922ac2652a35f2d08b44 Mon Sep 17 00:00:00 2001 From: Tetsuharu OHZEKI Date: Sun, 4 Jan 2015 05:14:55 +0900 Subject: Make script load event asynchronous for internal scripts --- components/script/dom/htmlscriptelement.rs | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'components/script/dom') diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 5acef40364e..411110dbb81 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -15,6 +15,7 @@ use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast, NodeCas use dom::bindings::codegen::InheritTypes::EventTargetCast; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JSRef, Temporary, OptionalRootable}; +use dom::bindings::refcounted::Trusted; use dom::document::Document; use dom::element::{Element, AttributeHandlers, ElementCreator}; use dom::eventtarget::{EventTarget, EventTargetTypeId, EventTargetHelpers}; @@ -24,6 +25,7 @@ use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeHelpers, NodeTypeId, window_from_node, CloneChildrenFlag}; use dom::virtualmethods::VirtualMethods; use dom::window::ScriptHelpers; +use script_task::{ScriptMsg, Runnable}; use encoding::all::UTF_8; use encoding::types::{Encoding, DecoderTrap}; @@ -89,6 +91,9 @@ pub trait HTMLScriptElementHelpers { /// Set the "already started" flag () fn mark_already_started(self); + + /// Dispatch load event. + fn dispatch_load_event(self); } /// Supported script types as defined by @@ -216,6 +221,23 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { window.evaluate_script_on_global_with_result(source.as_slice(), url.serialize().as_slice()); + // https://html.spec.whatwg.org/multipage/scripting.html#execute-the-script-block + // step 2, substep 10 + match origin { + ScriptOrigin::External => { + self.dispatch_load_event(); + } + ScriptOrigin::Internal => { + let chan = window.script_chan(); + let handler = Trusted::new(window.get_cx(), self, chan.clone()); + chan.send(ScriptMsg::RunnableMsg(box handler)); + } + } + } + + fn dispatch_load_event(self) { + let window = window_from_node(self).root(); + let window = window.r(); let event = Event::new(GlobalRef::Window(window), "load".into_string(), EventBubbles::DoesNotBubble, @@ -336,3 +358,9 @@ impl<'a> HTMLScriptElementMethods for JSRef<'a, HTMLScriptElement> { } } +impl Runnable for Trusted { + fn handler(&self) { + let target = self.to_temporary().root(); + target.r().dispatch_load_event(); + } +} -- cgit v1.2.3 From 4629b7ccf0b0ff27d437f369d42e5c9ffaf79e4a Mon Sep 17 00:00:00 2001 From: Tetsuharu OHZEKI Date: Sun, 11 Jan 2015 03:38:21 +0900 Subject: fixup! Make script load event asynchronous for internal scripts --- components/script/dom/htmlscriptelement.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom') diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 411110dbb81..c2af3ae9f6a 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -359,7 +359,7 @@ impl<'a> HTMLScriptElementMethods for JSRef<'a, HTMLScriptElement> { } impl Runnable for Trusted { - fn handler(&self) { + fn handler(self: Box>) { let target = self.to_temporary().root(); target.r().dispatch_load_event(); } -- cgit v1.2.3