auto merge of #2450 : zwarich/servo/image-cache-priv, r=pcwalton

This commit is contained in:
bors-servo 2014-05-16 18:01:43 -04:00
commit 060f17dc6f

View file

@ -22,18 +22,9 @@ pub enum Msg {
/// before Decode /// before Decode
Prefetch(Url), Prefetch(Url),
// FIXME: We can probably get rid of this Cell now
// FIXME: make this priv after visibility rules change
/// Used be the prefetch tasks to post back image binaries
StorePrefetchedImageData(Url, Result<~[u8], ()>),
/// Tell the cache to decode an image. Must be posted before GetImage/WaitForImage /// Tell the cache to decode an image. Must be posted before GetImage/WaitForImage
Decode(Url), Decode(Url),
/// Used by the decoder tasks to post decoded images back to the cache
// FIXME: make this priv after visibility rules change
StoreImage(Url, Option<Arc<~Image>>),
/// Request an Image object for a URL. If the image is not is not immediately /// Request an Image object for a URL. If the image is not is not immediately
/// available then ImageNotReady is returned. /// available then ImageNotReady is returned.
GetImage(Url, Sender<ImageResponseMsg>), GetImage(Url, Sender<ImageResponseMsg>),
@ -44,13 +35,18 @@ pub enum Msg {
/// Clients must wait for a response before shutting down the ResourceTask /// Clients must wait for a response before shutting down the ResourceTask
Exit(Sender<()>), Exit(Sender<()>),
/// For testing // FIXME: We can probably get rid of this Cell now
// FIXME: make this priv after visibility rules change /// Used be the prefetch tasks to post back image binaries
WaitForStore(Sender<()>), priv StorePrefetchedImageData(Url, Result<~[u8], ()>),
/// Used by the decoder tasks to post decoded images back to the cache
priv StoreImage(Url, Option<Arc<~Image>>),
/// For testing /// For testing
// FIXME: make this priv after visibility rules change priv WaitForStore(Sender<()>),
WaitForStorePrefetched(Sender<()>),
/// For testing
priv WaitForStorePrefetched(Sender<()>),
} }
#[deriving(Clone)] #[deriving(Clone)]