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

Rename Reflectable::global_scope to global

Browse source
This commit is contained in:
Anthony Ramine 2016-10-05 11:06:25 +02:00
parent b6bbd41e11
commit d8e92bb271
37 changed files with 151 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/fetch.rs
View file

@ -76,7 +76,7 @@ pub fn Fetch(global: &GlobalScope, input: RequestOrUSVString, init: &RequestInit
// Step 2
let request = match Request::Constructor(global, input, init) {
Err(e) => {
promise.reject_error(promise.global_scope().get_cx(), e);
promise.reject_error(promise.global().get_cx(), e);
return promise;
},
Ok(r) => r.get_request(),
@ -124,13 +124,13 @@ impl FetchResponseListener for FetchContext {
// JSAutoCompartment needs to be manually made.
// Otherwise, Servo will crash.
let promise_cx = promise.global_scope().get_cx();
let promise_cx = promise.global().get_cx();
let _ac = JSAutoCompartment::new(promise_cx, promise.reflector().get_jsobject().get());
match fetch_metadata {
// Step 4.1
Err(_) => {
promise.reject_error(
promise.global_scope().get_cx(),
promise.global().get_cx(),
Error::Type("Network error occurred".to_string()));
self.fetch_promise = Some(TrustedPromise::new(promise));
return;