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

Rename ScriptOrigin to ClassicScript

Browse source
This commit is contained in:
Anthony Ramine 2017-01-10 22:07:23 +01:00
parent 438182a7de
commit 965370c0bf
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,7 @@ pub struct HTMLScriptElement {
parser_document: JS<Document>, parser_document: JS<Document>,
/// The source this script was loaded from /// The source this script was loaded from
load: DOMRefCell<Option<Result<ScriptOrigin, NetworkError>>>, load: DOMRefCell<Option<Result<ClassicScript, NetworkError>>>,
} }
impl HTMLScriptElement { impl HTMLScriptElement {
@ -113,23 +113,23 @@ static SCRIPT_JS_MIMES: StaticStringVec = &[
]; ];
#[derive(HeapSizeOf, JSTraceable)] #[derive(HeapSizeOf, JSTraceable)]
pub struct ScriptOrigin { pub struct ClassicScript {
text: DOMString, text: DOMString,
url: ServoUrl, url: ServoUrl,
external: bool, external: bool,
} }
impl ScriptOrigin { impl ClassicScript {
fn internal(text: DOMString, url: ServoUrl) -> ScriptOrigin { fn internal(text: DOMString, url: ServoUrl) -> ClassicScript {
ScriptOrigin { ClassicScript {
text: text, text: text,
url: url, url: url,
external: false, external: false,
} }
} }
fn external(text: DOMString, url: ServoUrl) -> ScriptOrigin { fn external(text: DOMString, url: ServoUrl) -> ClassicScript {
ScriptOrigin { ClassicScript {
text: text, text: text,
url: url, url: url,
external: true, external: true,
@ -200,7 +200,7 @@ impl FetchResponseListener 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) ClassicScript::external(DOMString::from(source_text), metadata.final_url)
}); });
// Step 9. // Step 9.
@ -394,7 +394,7 @@ impl HTMLScriptElement {
return; return;
} }
// Step 20.3: The "from an external file"" flag is stored in ScriptOrigin. // Step 20.3: The "from an external file"" flag is stored in ClassicScript.
// Step 20.4-20.5. // Step 20.4-20.5.
let url = match base_url.join(&src) { let url = match base_url.join(&src) {
@ -434,7 +434,7 @@ impl HTMLScriptElement {
} else { } else {
// Step 21. // Step 21.
assert!(!text.is_empty()); assert!(!text.is_empty());
*self.load.borrow_mut() = Some(Ok(ScriptOrigin::internal(text, base_url))); *self.load.borrow_mut() = Some(Ok(ClassicScript::internal(text, base_url)));
self.ready_to_be_parser_executed.set(true); self.ready_to_be_parser_executed.set(true);
// Step 22. // Step 22.