Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-01 22:55:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #10591 - Use the document base url when resolving script URLs (from Liamsi:base_url_script_element); r=KiChjang

Browse Source 
Does this resolve #10578?

Source-Repo: https://github.com/servo/servo
Source-Revision: 9896e530941411c10c73125de66d41512c3b4097
This commit is contained in:
Liamsi 2016-04-15 06:28:36 +05:01
parent c2118ff4b1
commit 05bfbb323d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
servo/components/script/dom/htmlscriptelement.rs
View File

@ -272,10 +272,7 @@ impl HTMLScriptElement {
// TODO: Step 15: environment settings object.
let window = window_from_node(self);
let window = window.r();
let base_url = window.get_url();
let base_url = doc.base_url();
let is_external = match element.get_attribute(&ns!(), &atom!("src")) {
// Step 16.
Some(ref src) => {
@ -300,7 +297,7 @@ impl HTMLScriptElement {
// Step 16.6.
// TODO(#9186): use the fetch infrastructure.
let script_chan = window.networking_task_source();
let script_chan = doc.window().networking_task_source();
let elem = Trusted::new(self, script_chan.clone());
let context = Arc::new(Mutex::new(ScriptContext {