Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10502 - KiChjang:fix-open-url-base, r=Ms2ger

Browse source 
Add API base url method to global objects

This adds an `api_base_url` function to global objects, which fixes `open-url-base.htm` under XMLHttpRequest.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10502)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-11 17:57:02 +05:30
commit 07304235cc
4 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/bindings/global.rs
View file

@ -143,6 +143,17 @@ impl<'a> GlobalRef<'a> {
}
}
/// Get the [base url](https://html.spec.whatwg.org/multipage/#api-base-url)
/// for this global scope.
pub fn api_base_url(&self) -> Url {
match *self {
// https://html.spec.whatwg.org/multipage/#script-settings-for-browsing-contexts:api-base-url
GlobalRef::Window(ref window) => window.Document().base_url(),
// https://html.spec.whatwg.org/multipage/#script-settings-for-workers:api-base-url
GlobalRef::Worker(ref worker) => worker.get_url().clone(),
}
}
/// `ScriptChan` used to send messages to the event loop of this global's
/// thread.
pub fn script_chan(&self) -> Box<ScriptChan + Send> {

2
components/script/dom/xmlhttprequest.rs
View file

@ -350,7 +350,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
}
// Step 2
let base = self.global().r().get_url();
let base = self.global().r().api_base_url();
// Step 6
let mut parsed_url = match base.join(&url.0) {
Ok(parsed) => parsed,

5
tests/wpt/metadata/XMLHttpRequest/open-url-base.htm.ini
View file

@ -1,5 +0,0 @@
[open-url-base.htm]
type: testharness
[XMLHttpRequest: open() resolving URLs - ]
expected: FAIL

5
tests/wpt/metadata/XMLHttpRequest/send-non-same-origin.sub.htm.ini
View file

@ -1,5 +0,0 @@
[send-non-same-origin.sub.htm]
type: testharness
[XMLHttpRequest: send() - non same-origin (folder.txt)]
expected: FAIL