Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Turn ScriptOrigin into a struct.

Browse source
This commit is contained in:
Ms2ger 2016-07-15 17:21:49 +02:00
parent a13318fb2c
commit 91b9bcd125
1 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -111,9 +111,28 @@ static SCRIPT_JS_MIMES: StaticStringVec = &[
]; ];
#[derive(HeapSizeOf, JSTraceable)] #[derive(HeapSizeOf, JSTraceable)]
pub enum ScriptOrigin { pub struct ScriptOrigin {
Internal(DOMString, Url), text: DOMString,
External(DOMString, Url), url: Url,
external: bool,
}
impl ScriptOrigin {
fn internal(text: DOMString, url: Url) -> ScriptOrigin {
ScriptOrigin {
text: text,
url: url,
external: false,
}
}
fn external(text: DOMString, url: Url) -> ScriptOrigin {
ScriptOrigin {
text: text,
url: url,
external: true,
}
}
} }
/// The context required for asynchronously loading an external script source. /// The context required for asynchronously loading an external script source.
@ -172,7 +191,7 @@ impl AsyncResponseListener for ScriptContext {
// Step 7. // Step 7.
let source_text = encoding.decode(&self.data, DecoderTrap::Replace).unwrap(); let source_text = encoding.decode(&self.data, DecoderTrap::Replace).unwrap();
ScriptOrigin::External(DOMString::from(source_text), metadata.final_url) ScriptOrigin::external(DOMString::from(source_text), metadata.final_url)
}); });
// Step 9. // Step 9.
@ -374,13 +393,13 @@ impl HTMLScriptElement {
// TODO: check for script nesting levels. // TODO: check for script nesting levels.
doc.get_script_blocking_stylesheets_count() > 0 { doc.get_script_blocking_stylesheets_count() > 0 {
doc.set_pending_parsing_blocking_script(Some(self)); doc.set_pending_parsing_blocking_script(Some(self));
*self.load.borrow_mut() = Some(Ok(ScriptOrigin::Internal(text, base_url))); *self.load.borrow_mut() = Some(Ok(ScriptOrigin::internal(text, base_url)));
self.ready_to_be_parser_executed.set(true); self.ready_to_be_parser_executed.set(true);
// Step 20.f: otherwise. // Step 20.f: otherwise.
} else { } else {
assert!(!text.is_empty()); assert!(!text.is_empty());
self.ready_to_be_parser_executed.set(true); self.ready_to_be_parser_executed.set(true);
*self.load.borrow_mut() = Some(Ok(ScriptOrigin::Internal(text, base_url))); *self.load.borrow_mut() = Some(Ok(ScriptOrigin::internal(text, base_url)));
self.execute(); self.execute();
return NextParserState::Continue; return NextParserState::Continue;
} }
@ -417,14 +436,12 @@ impl HTMLScriptElement {
return; return;
} }
Ok(ScriptOrigin::External(text, url)) => { Ok(ScriptOrigin { text, url, external }) => {
debug!("loading external script, url = {}", url); if external {
(text, true, url) debug!("loading external script, url = {}", url);
}
(text, external, url)
}, },
Ok(ScriptOrigin::Internal(text, url)) => {
(text, false, url)
}
}; };
// TODO(#12446): beforescriptexecute. // TODO(#12446): beforescriptexecute.