From a13318fb2cb40e2db8daa8aef16ed37c760a6e1c Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 15 Jul 2016 17:01:18 +0200 Subject: [PATCH] Convert script source to DOMString earlier. --- components/script/dom/htmlscriptelement.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 8160400eb35..87dfa14b7d4 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -113,7 +113,7 @@ static SCRIPT_JS_MIMES: StaticStringVec = &[ #[derive(HeapSizeOf, JSTraceable)] pub enum ScriptOrigin { Internal(DOMString, Url), - External(String, Url), + External(DOMString, Url), } /// The context required for asynchronously loading an external script source. @@ -172,7 +172,7 @@ impl AsyncResponseListener for ScriptContext { // Step 7. 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. @@ -419,7 +419,7 @@ impl HTMLScriptElement { Ok(ScriptOrigin::External(text, url)) => { debug!("loading external script, url = {}", url); - (DOMString::from(text), true, url) + (text, true, url) }, Ok(ScriptOrigin::Internal(text, url)) => {