Auto merge of #14632 - servo:multi-global-fetch, r=jdm

Use the API base URL in Fetch APIs.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14632)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-12-22 16:40:53 -08:00 committed by GitHub
commit 89cdcbc420
10 changed files with 11 additions and 23 deletions

View file

@ -92,8 +92,7 @@ impl Request {
let mut fallback_credentials: Option<NetTraitsRequestCredentials> = None;
// Step 4
// TODO: `entry settings object` is not implemented in Servo yet.
let base_url = global.get_url();
let base_url = global.api_base_url();
match input {
// Step 5

View file

@ -149,8 +149,7 @@ impl Response {
// https://fetch.spec.whatwg.org/#dom-response-redirect
pub fn Redirect(global: &GlobalScope, url: USVString, status: u16) -> Fallible<Root<Response>> {
// Step 1
// TODO: `entry settings object` is not implemented in Servo yet.
let base_url = global.get_url();
let base_url = global.api_base_url();
let parsed_url = base_url.join(&url.0);
// Step 2