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

Remove compositor dependency on net crate.

Browse source 
Move the ImageCacheTaskClient trait and impl to net_traits. Fixes #5551.
This commit is contained in:
Aneesh Agrawal 2015-04-07 01:20:38 -04:00
parent c9a413cb6e
commit a1d7456307
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/compositing/constellation.rs
View file

@ -20,9 +20,8 @@ use msg::constellation_msg::{IFrameSandboxState, MozBrowserEvent, NavigationDire
use msg::constellation_msg::{Key, KeyState, KeyModifiers, LoadData};
use msg::constellation_msg::{SubpageId, WindowSizeData};
use msg::constellation_msg::{self, ConstellationChan, Failure};
use net::image_cache_task::ImageCacheTaskClient;
use net_traits::{self, ResourceTask};
use net_traits::image_cache_task::ImageCacheTask;
use net_traits::image_cache_task::{ImageCacheTask, ImageCacheTaskClient};
use net_traits::storage_task::{StorageTask, StorageTaskMsg};
use profile::mem;
use profile::time;

12
components/net/image_cache_task.rs
View file

@ -395,18 +395,6 @@ impl ImageCache {
}
}
pub trait ImageCacheTaskClient {
fn exit(&self);
}
impl ImageCacheTaskClient for ImageCacheTask {
fn exit(&self) {
let (response_chan, response_port) = channel();
self.send(Msg::Exit(response_chan));
response_port.recv().unwrap();
}
}
pub fn spawn_listener<F, A>(f: F) -> Sender<A>
where F: FnOnce(Receiver<A>) + Send + 'static,
A: Send + 'static

12
components/net_traits/image_cache_task.rs
View file

@ -70,6 +70,18 @@ impl ImageCacheTask {
}
}
pub trait ImageCacheTaskClient {
fn exit(&self);
}
impl ImageCacheTaskClient for ImageCacheTask {
fn exit(&self) {
let (response_chan, response_port) = channel();
self.send(Msg::Exit(response_chan));
response_port.recv().unwrap();
}
}
pub fn load_image_data(url: Url, resource_task: ResourceTask, placeholder: &[u8]) -> Result<Vec<u8>, ()> {
let (response_chan, response_port) = channel();
resource_task.send(ControlMsg::Load(LoadData::new(url.clone(), response_chan))).unwrap();