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

Make XMLHttpRequest::fetch take a &GlobalScope

Browse source
This commit is contained in:
Anthony Ramine 2016-10-05 09:46:53 +02:00
parent ca15dd5eea
commit 0a11c48e89
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,6 @@ use dom::bindings::codegen::Bindings::XMLHttpRequestBinding::XMLHttpRequestMetho
use dom::bindings::codegen::Bindings::XMLHttpRequestBinding::XMLHttpRequestResponseType; use dom::bindings::codegen::Bindings::XMLHttpRequestBinding::XMLHttpRequestResponseType;
use dom::bindings::conversions::ToJSValConvertible; use dom::bindings::conversions::ToJSValConvertible;
use dom::bindings::error::{Error, ErrorResult, Fallible}; use dom::bindings::error::{Error, ErrorResult, Fallible};
use dom::bindings::global::GlobalRef;
use dom::bindings::inheritance::Castable; use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, MutHeapJSVal, MutNullableHeap}; use dom::bindings::js::{JS, MutHeapJSVal, MutNullableHeap};
use dom::bindings::js::{Root, RootedReference}; use dom::bindings::js::{Root, RootedReference};
@ -650,7 +649,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
self.fetch_time.set(time::now().to_timespec().sec); self.fetch_time.set(time::now().to_timespec().sec);
let rv = self.fetch(request, self.global().r()); let rv = self.fetch(request, &self.global_scope());
// Step 10 // Step 10
if self.sync.get() { if self.sync.get() {
return rv; return rv;
@ -1285,7 +1284,7 @@ impl XMLHttpRequest {
fn fetch(&self, fn fetch(&self,
init: RequestInit, init: RequestInit,
global: GlobalRef) -> ErrorResult { global: &GlobalScope) -> ErrorResult {
let xhr = Trusted::new(self); let xhr = Trusted::new(self);
let context = Arc::new(Mutex::new(XHRContext { let context = Arc::new(Mutex::new(XHRContext {
@ -1295,21 +1294,20 @@ impl XMLHttpRequest {
sync_status: DOMRefCell::new(None), sync_status: DOMRefCell::new(None),
})); }));
let global_scope = global.as_global_scope();
let (script_chan, script_port) = if self.sync.get() { let (script_chan, script_port) = if self.sync.get() {
let (tx, rx) = global_scope.new_script_pair(); let (tx, rx) = global.new_script_pair();
(tx, Some(rx)) (tx, Some(rx))
} else { } else {
(global_scope.networking_task_source(), None) (global.networking_task_source(), None)
}; };
let core_resource_thread = global_scope.core_resource_thread(); let core_resource_thread = global.core_resource_thread();
XMLHttpRequest::initiate_async_xhr(context.clone(), script_chan, XMLHttpRequest::initiate_async_xhr(context.clone(), script_chan,
core_resource_thread, init); core_resource_thread, init);
if let Some(script_port) = script_port { if let Some(script_port) = script_port {
loop { loop {
global_scope.process_event(script_port.recv().unwrap()); global.process_event(script_port.recv().unwrap());
let context = context.lock().unwrap(); let context = context.lock().unwrap();
let sync_status = context.sync_status.borrow(); let sync_status = context.sync_status.borrow();
if let Some(ref status) = *sync_status { if let Some(ref status) = *sync_status {