Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add the enum to describe the script origin.

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2015-01-04 04:48:09 +09:00
parent 879af966b3
commit f627b35ef6
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/htmlscriptelement.rs
View file

@ -112,6 +112,11 @@ static SCRIPT_JS_MIMES: StaticStringVec = &[
"text/x-javascript", "text/x-javascript",
]; ];
enum ScriptOrigin {
Internal,
External,
}
impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> {
fn prepare(self) { fn prepare(self) {
// https://html.spec.whatwg.org/multipage/scripting.html#prepare-a-script // 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 page = window.page();
let base_url = page.get_url(); 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) => { Some(src) => {
if src.r().Value().is_empty() { if src.r().Value().is_empty() {
// TODO: queue a task to fire a simple event named `error` at the element // 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)) => { Ok((metadata, bytes)) => {
// TODO: use the charset from step 13. // TODO: use the charset from step 13.
let source = UTF_8.decode(bytes.as_slice(), DecoderTrap::Replace).unwrap(); let source = UTF_8.decode(bytes.as_slice(), DecoderTrap::Replace).unwrap();
(source, metadata.final_url) (ScriptOrigin::External, source, metadata.final_url)
} }
Err(_) => { Err(_) => {
error!("error loading script {}", src.r().Value()); 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()); window.evaluate_script_on_global_with_result(source.as_slice(), url.serialize().as_slice());