diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index 6317a7af1d3..b2d2456e211 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -536,13 +536,6 @@ impl PendingAsyncLoad { let consumer = LoadConsumer::Listener(listener); self.core_resource_thread.send(CoreResourceMsg::Load(load_data, consumer, None)).unwrap(); } - - /// Initiate the fetch associated with this pending load. - pub fn fetch_async(mut self, request: RequestInit, fetch_target: IpcSender) { - self.guard.neuter(); - - self.core_resource_thread.send(CoreResourceMsg::Fetch(request, fetch_target)).unwrap(); - } } /// Message sent in response to `Load`. Contains metadata, and a port diff --git a/components/script/document_loader.rs b/components/script/document_loader.rs index 5209b68b9ac..516a026e61d 100644 --- a/components/script/document_loader.rs +++ b/components/script/document_loader.rs @@ -9,8 +9,8 @@ use dom::bindings::js::JS; use dom::document::Document; use ipc_channel::ipc::IpcSender; use msg::constellation_msg::{PipelineId, ReferrerPolicy}; -use net_traits::{AsyncResponseTarget, PendingAsyncLoad, LoadContext}; -use net_traits::{FetchResponseMsg, ResourceThreads, IpcSend}; +use net_traits::{AsyncResponseTarget, CoreResourceMsg, PendingAsyncLoad}; +use net_traits::{FetchResponseMsg, LoadContext, ResourceThreads, IpcSend}; use net_traits::request::RequestInit; use std::thread; use url::Url; @@ -154,11 +154,9 @@ impl DocumentLoader { pub fn fetch_async(&mut self, load: LoadType, request: RequestInit, - fetch_target: IpcSender, - referrer: &Document, - referrer_policy: Option) { - let pending = self.prepare_async_load(load, referrer, referrer_policy); - pending.fetch_async(request, fetch_target); + fetch_target: IpcSender) { + self.add_blocking_load(load); + self.resource_threads.sender().send(CoreResourceMsg::Fetch(request, fetch_target)).unwrap(); } /// Mark an in-progress network request complete. diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 1b91e743a78..2d645a53775 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -1441,10 +1441,9 @@ impl Document { pub fn fetch_async(&self, load: LoadType, request: RequestInit, - fetch_target: IpcSender, - referrer_policy: Option) { + fetch_target: IpcSender) { let mut loader = self.loader.borrow_mut(); - loader.fetch_async(load, request, fetch_target, self, referrer_policy); + loader.fetch_async(load, request, fetch_target); } pub fn finish_load(&self, load: LoadType) { diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index ed550309a3c..a4bcbb97d52 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -271,7 +271,7 @@ fn fetch_a_classic_script(script: &HTMLScriptElement, ROUTER.add_route(action_receiver.to_opaque(), box move |message| { listener.notify_fetch(message.to().unwrap()); }); - doc.fetch_async(LoadType::Script(url), request, action_sender, None); + doc.fetch_async(LoadType::Script(url), request, action_sender); } impl HTMLScriptElement {