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

Convert script source to DOMString earlier.

Browse source
This commit is contained in:
Ms2ger 2016-07-15 17:01:18 +02:00
parent 4896200467
commit a13318fb2c
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,7 +113,7 @@ static SCRIPT_JS_MIMES: StaticStringVec = &[
#[derive(HeapSizeOf, JSTraceable)] #[derive(HeapSizeOf, JSTraceable)]
pub enum ScriptOrigin { pub enum ScriptOrigin {
Internal(DOMString, Url), Internal(DOMString, Url),
External(String, Url), External(DOMString, Url),
} }
/// The context required for asynchronously loading an external script source. /// The context required for asynchronously loading an external script source.
@ -172,7 +172,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(source_text, metadata.final_url) ScriptOrigin::External(DOMString::from(source_text), metadata.final_url)
}); });
// Step 9. // Step 9.
@ -419,7 +419,7 @@ impl HTMLScriptElement {
Ok(ScriptOrigin::External(text, url)) => { Ok(ScriptOrigin::External(text, url)) => {
debug!("loading external script, url = {}", url); debug!("loading external script, url = {}", url);
(DOMString::from(text), true, url) (text, true, url)
}, },
Ok(ScriptOrigin::Internal(text, url)) => { Ok(ScriptOrigin::Internal(text, url)) => {