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

Remove cancellation map and ResourceId from the net* components

Browse source 
Fixes #19327
This commit is contained in:
Bastien Orivel 2017-11-21 22:58:30 +01:00
parent d1e4fdb7fa
commit d55e0fa802
2 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/net/resource_thread.rs
View file

@ -17,9 +17,9 @@ use http_loader::{HttpState, http_redirect_fetch};
use hyper_serde::Serde; use hyper_serde::Serde;
use ipc_channel::ipc::{self, IpcReceiver, IpcReceiverSet, IpcSender}; use ipc_channel::ipc::{self, IpcReceiver, IpcReceiverSet, IpcSender};
use net_traits::{CookieSource, CoreResourceThread}; use net_traits::{CookieSource, CoreResourceThread};
use net_traits::{CoreResourceMsg, FetchChannels, FetchResponseMsg}; use net_traits::{CoreResourceMsg, CustomResponseMediator, FetchChannels};
use net_traits::{CustomResponseMediator, ResourceId}; use net_traits::{FetchResponseMsg, ResourceThreads, WebSocketDomAction};
use net_traits::{ResourceThreads, WebSocketDomAction, WebSocketNetworkEvent}; use net_traits::WebSocketNetworkEvent;
use net_traits::request::{Request, RequestInit}; use net_traits::request::{Request, RequestInit};
use net_traits::response::{Response, ResponseInit}; use net_traits::response::{Response, ResponseInit};
use net_traits::storage_thread::StorageThreadMsg; 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(); let cookies = cookie_jar.cookies_data_for_url(&url, source).map(Serde).collect();
consumer.send(cookies).unwrap(); 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) => { CoreResourceMsg::Synchronize(sender) => {
let _ = sender.send(()); let _ = sender.send(());
} }
@ -302,7 +296,6 @@ pub struct CoreResourceManager {
devtools_chan: Option<Sender<DevtoolsControlMsg>>, devtools_chan: Option<Sender<DevtoolsControlMsg>>,
swmanager_chan: Option<IpcSender<CustomResponseMediator>>, swmanager_chan: Option<IpcSender<CustomResponseMediator>>,
filemanager: FileManager, filemanager: FileManager,
cancel_load_map: HashMap<ResourceId, Sender<()>>,
} }
impl CoreResourceManager { impl CoreResourceManager {
@ -314,7 +307,6 @@ impl CoreResourceManager {
devtools_chan: devtools_channel, devtools_chan: devtools_channel,
swmanager_chan: None, swmanager_chan: None,
filemanager: FileManager::new(), filemanager: FileManager::new(),
cancel_load_map: HashMap::new(),
} }
} }

6
components/net_traits/lib.rs
View file

@ -362,8 +362,6 @@ pub enum CoreResourceMsg {
GetCookiesForUrl(ServoUrl, IpcSender<Option<String>>, CookieSource), GetCookiesForUrl(ServoUrl, IpcSender<Option<String>>, CookieSource),
/// Get a cookie by name for a given originating URL /// Get a cookie by name for a given originating URL
GetCookiesDataForUrl(ServoUrl, IpcSender<Vec<Serde<Cookie<'static>>>>, CookieSource), GetCookiesDataForUrl(ServoUrl, IpcSender<Vec<Serde<Cookie<'static>>>>, CookieSource),
/// Cancel a network request corresponding to a given `ResourceId`
Cancel(ResourceId),
/// Synchronization message solely for knowing the state of the ResourceChannelManager loop /// Synchronization message solely for knowing the state of the ResourceChannelManager loop
Synchronize(IpcSender<()>), Synchronize(IpcSender<()>),
/// Send the network sender in constellation to CoreResourceThread /// 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 /// Network errors that have to be exported out of the loaders
#[derive(Clone, Debug, Deserialize, Eq, MallocSizeOf, PartialEq, Serialize)] #[derive(Clone, Debug, Deserialize, Eq, MallocSizeOf, PartialEq, Serialize)]
pub enum NetworkError { pub enum NetworkError {