diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs index da16897fc6c..c319db98505 100644 --- a/components/net/resource_thread.rs +++ b/components/net/resource_thread.rs @@ -17,9 +17,9 @@ use http_loader::{HttpState, http_redirect_fetch}; use hyper_serde::Serde; use ipc_channel::ipc::{self, IpcReceiver, IpcReceiverSet, IpcSender}; use net_traits::{CookieSource, CoreResourceThread}; -use net_traits::{CoreResourceMsg, FetchChannels, FetchResponseMsg}; -use net_traits::{CustomResponseMediator, ResourceId}; -use net_traits::{ResourceThreads, WebSocketDomAction, WebSocketNetworkEvent}; +use net_traits::{CoreResourceMsg, CustomResponseMediator, FetchChannels}; +use net_traits::{FetchResponseMsg, ResourceThreads, WebSocketDomAction}; +use net_traits::WebSocketNetworkEvent; use net_traits::request::{Request, RequestInit}; use net_traits::response::{Response, ResponseInit}; use net_traits::storage_thread::StorageThreadMsg; @@ -187,12 +187,6 @@ impl ResourceChannelManager { let cookies = cookie_jar.cookies_data_for_url(&url, source).map(Serde).collect(); consumer.send(cookies).unwrap(); } - CoreResourceMsg::Cancel(res_id) => { - if let Some(cancel_sender) = self.resource_manager.cancel_load_map.get(&res_id) { - let _ = cancel_sender.send(()); - } - self.resource_manager.cancel_load_map.remove(&res_id); - } CoreResourceMsg::Synchronize(sender) => { let _ = sender.send(()); } @@ -302,7 +296,6 @@ pub struct CoreResourceManager { devtools_chan: Option>, swmanager_chan: Option>, filemanager: FileManager, - cancel_load_map: HashMap>, } impl CoreResourceManager { @@ -314,7 +307,6 @@ impl CoreResourceManager { devtools_chan: devtools_channel, swmanager_chan: None, filemanager: FileManager::new(), - cancel_load_map: HashMap::new(), } } diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index c5aad91ce26..32e730eede8 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -362,8 +362,6 @@ pub enum CoreResourceMsg { GetCookiesForUrl(ServoUrl, IpcSender>, CookieSource), /// Get a cookie by name for a given originating URL GetCookiesDataForUrl(ServoUrl, IpcSender>>>, CookieSource), - /// Cancel a network request corresponding to a given `ResourceId` - Cancel(ResourceId), /// Synchronization message solely for knowing the state of the ResourceChannelManager loop Synchronize(IpcSender<()>), /// Send the network sender in constellation to CoreResourceThread @@ -500,10 +498,6 @@ pub fn load_whole_resource(request: RequestInit, } } -/// An unique identifier to keep track of each load message in the resource handler -#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, MallocSizeOf, PartialEq, Serialize)] -pub struct ResourceId(pub u32); - /// Network errors that have to be exported out of the loaders #[derive(Clone, Debug, Deserialize, Eq, MallocSizeOf, PartialEq, Serialize)] pub enum NetworkError {