diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-02 14:29:01 +0200 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-06 21:35:44 +0200 |
| commit | f38159b7d39acccef464857b101e9c8a6855aa6e (patch) | |
| tree | 2dedb19401e0f2586a8e0bfa8d29f67ecc7abce5 /components/script/dom/xmlhttprequest.rs | |
| parent | 092504b4e3c10593730e3c625f98863651b9cc91 (diff) | |
| download | servo-f38159b7d39acccef464857b101e9c8a6855aa6e.tar.gz servo-f38159b7d39acccef464857b101e9c8a6855aa6e.zip | |
Introduce GlobalScope::get_url
Diffstat (limited to 'components/script/dom/xmlhttprequest.rs')
| -rw-r--r-- | components/script/dom/xmlhttprequest.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 844d46f904e..a87d64e3e61 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -595,7 +595,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest { use_cors_preflight: has_handlers, credentials_mode: credentials_mode, use_url_credentials: use_url_credentials, - origin: self.global().r().get_url(), + origin: self.global_scope().get_url(), referrer_url: self.referrer_url.clone(), referrer_policy: self.referrer_policy.clone(), pipeline_id: self.pipeline_id(), @@ -1204,7 +1204,7 @@ impl XMLHttpRequest { // TODO: Disable scripting while parsing parse_html(document.r(), DOMString::from(decoded), - wr.get_url(), + wr.as_global_scope().get_url(), ParseContext::Owner(Some(wr.as_global_scope().pipeline_id()))); document } @@ -1218,7 +1218,7 @@ impl XMLHttpRequest { // TODO: Disable scripting while parsing parse_xml(document.r(), DOMString::from(decoded), - wr.get_url(), + wr.as_global_scope().get_url(), xml::ParseContext::Owner(Some(wr.as_global_scope().pipeline_id()))); document } @@ -1230,7 +1230,7 @@ impl XMLHttpRequest { let doc = win.Document(); let doc = doc.r(); let docloader = DocumentLoader::new(&*doc.loader()); - let base = self.global().r().get_url(); + let base = self.global_scope().get_url(); let parsed_url = match base.join(&self.ResponseURL().0) { Ok(parsed) => Some(parsed), Err(_) => None // Step 7 |