Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make Fetch take a &GlobalScope

Browse source
This commit is contained in:
Anthony Ramine 2016-10-05 01:48:25 +02:00
parent 144dc62575
commit 1f8bb3a89f
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -861,7 +861,7 @@ impl WindowMethods for Window {
#[allow(unrooted_must_root)] #[allow(unrooted_must_root)]
// https://fetch.spec.whatwg.org/#fetch-method // https://fetch.spec.whatwg.org/#fetch-method
fn Fetch(&self, input: RequestOrUSVString, init: &RequestInit) -> Rc<Promise> { fn Fetch(&self, input: RequestOrUSVString, init: &RequestInit) -> Rc<Promise> {
fetch::Fetch(self.global().r(), input, init) fetch::Fetch(&self.upcast(), input, init)
} }
} }

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

@ -319,7 +319,7 @@ impl WorkerGlobalScopeMethods for WorkerGlobalScope {
#[allow(unrooted_must_root)] #[allow(unrooted_must_root)]
// https://fetch.spec.whatwg.org/#fetch-method // https://fetch.spec.whatwg.org/#fetch-method
fn Fetch(&self, input: RequestOrUSVString, init: &RequestInit) -> Rc<Promise> { fn Fetch(&self, input: RequestOrUSVString, init: &RequestInit) -> Rc<Promise> {
fetch::Fetch(self.global().r(), input, init) fetch::Fetch(self.upcast(), input, init)
} }
} }

17
components/script/fetch.rs
View file

@ -7,10 +7,10 @@ use dom::bindings::codegen::Bindings::ResponseBinding::ResponseBinding::Response
use dom::bindings::codegen::Bindings::ResponseBinding::ResponseType as DOMResponseType; use dom::bindings::codegen::Bindings::ResponseBinding::ResponseType as DOMResponseType;
use dom::bindings::codegen::UnionTypes::RequestOrUSVString; use dom::bindings::codegen::UnionTypes::RequestOrUSVString;
use dom::bindings::error::Error; use dom::bindings::error::Error;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::Root; use dom::bindings::js::Root;
use dom::bindings::refcounted::{Trusted, TrustedPromise}; use dom::bindings::refcounted::{Trusted, TrustedPromise};
use dom::bindings::reflector::Reflectable; use dom::bindings::reflector::Reflectable;
use dom::globalscope::GlobalScope;
use dom::headers::Guard; use dom::headers::Guard;
use dom::promise::Promise; use dom::promise::Promise;
use dom::request::Request; use dom::request::Request;
@ -66,18 +66,17 @@ fn request_init_from_request(request: NetTraitsRequest) -> NetTraitsRequestInit
// https://fetch.spec.whatwg.org/#fetch-method // https://fetch.spec.whatwg.org/#fetch-method
#[allow(unrooted_must_root)] #[allow(unrooted_must_root)]
pub fn Fetch(global: GlobalRef, input: RequestOrUSVString, init: &RequestInit) -> Rc<Promise> { pub fn Fetch(global: &GlobalScope, input: RequestOrUSVString, init: &RequestInit) -> Rc<Promise> {
let global_scope = global.as_global_scope(); let core_resource_thread = global.core_resource_thread();
let core_resource_thread = global_scope.core_resource_thread();
// Step 1 // Step 1
let promise = Promise::new(global_scope); let promise = Promise::new(global);
let response = Response::new(global_scope); let response = Response::new(global);
// Step 2 // Step 2
let request = match Request::Constructor(global_scope, input, init) { let request = match Request::Constructor(global, input, init) {
Err(e) => { Err(e) => {
promise.reject_error(promise.global().r().get_cx(), e); promise.reject_error(promise.global_scope().get_cx(), e);
return promise; return promise;
}, },
Ok(r) => r.get_request(), Ok(r) => r.get_request(),
@ -96,7 +95,7 @@ pub fn Fetch(global: GlobalRef, input: RequestOrUSVString, init: &RequestInit) -
})); }));
let listener = NetworkListener { let listener = NetworkListener {
context: fetch_context, context: fetch_context,
script_chan: global_scope.networking_task_source(), script_chan: global.networking_task_source(),
wrapper: None, wrapper: None,
}; };