diff options
Diffstat (limited to 'components/script/dom/xmlhttprequest.rs')
-rw-r--r-- | components/script/dom/xmlhttprequest.rs | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index a031b625036..d27fc3c06ca 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -73,7 +73,7 @@ use crate::dom::xmlhttprequestupload::XMLHttpRequestUpload; use crate::fetch::FetchCanceller; use crate::network_listener::{self, PreInvoke, ResourceTimingListener}; use crate::script_runtime::{CanGc, JSContext}; -use crate::task_source::networking::NetworkingTaskSource; +use crate::task_source::{TaskSource, TaskSourceName}; use crate::timers::{OneshotTimerCallback, OneshotTimerHandle}; #[derive(Clone, Copy, Debug, JSTraceable, MallocSizeOf, PartialEq)] @@ -294,7 +294,7 @@ impl XMLHttpRequest { fn initiate_async_xhr( context: Arc<Mutex<XHRContext>>, - task_source: NetworkingTaskSource, + task_source: TaskSource, global: &GlobalScope, init: RequestBuilder, cancellation_chan: ipc::IpcReceiver<()>, @@ -1560,10 +1560,17 @@ impl XMLHttpRequest { })); let (task_source, script_port) = if self.sync.get() { - let (tx, rx) = global.new_script_pair(); - (NetworkingTaskSource(tx, global.pipeline_id()), Some(rx)) + let (sender, receiver) = global.new_script_pair(); + ( + TaskSource { + sender, + pipeline_id: global.pipeline_id(), + name: TaskSourceName::Networking, + }, + Some(receiver), + ) } else { - (global.networking_task_source(), None) + (global.task_manager().networking_task_source(), None) }; let cancel_receiver = self.canceller.borrow_mut().initialize(); |