corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

servo: Merge #5118 - Async document loads (from jdm:pageload); r=Ms2ger

Browse Source 
Rebased and improved version of #4967.

Source-Repo: https://github.com/servo/servo
Source-Revision: 72f8898990f06e7f505eeaf9cfa671740c60395d
This commit is contained in:
Josh Matthews
2015-03-03 16:03:45 -07:00
parent ab3c7aea66
commit e85140b16c
37 changed files with 1045 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ use dom::element::ElementTypeId;
use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
use dom::node::{Node, NodeHelpers, NodeTypeId, document_from_node, window_from_node, CloneChildrenFlag};
use dom::virtualmethods::VirtualMethods;
use dom::window::ScriptHelpers;
use dom::window::{WindowHelpers, ScriptHelpers};
use script_task::{ScriptMsg, Runnable};
use encoding::all::UTF_8;
@@ -214,8 +214,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> {
// Step 14.
let window = window_from_node(self).root();
let window = window.r();
let page = window.page();
let base_url = page.get_url();
let base_url = window.get_url();
let load = match element.get_attribute(ns!(""), &atom!("src")).root() {
// Step 14.
@@ -243,7 +242,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> {
// state of the element's `crossorigin` content attribute, the origin being
// the origin of the script element's node document, and the default origin
// behaviour set to taint.
ScriptOrigin::External(load_whole_resource(&page.resource_task, url))
ScriptOrigin::External(load_whole_resource(&window.resource_task(), url))
}
}
},