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

Move ResponseAction to the image cache.

Browse source
This commit is contained in:
Ms2ger 2016-10-11 18:15:20 +02:00
parent 4bbeecb99f
commit 634a3989ad
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/net/image_cache_thread.rs
View file

@ -5,7 +5,7 @@
use immeta::load_from_buf; use immeta::load_from_buf;
use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use ipc_channel::router::ROUTER; use ipc_channel::router::ROUTER;
use net_traits::{CoreResourceThread, NetworkError, ResponseAction, fetch_async, FetchResponseMsg, FetchMetadata}; use net_traits::{CoreResourceThread, NetworkError, fetch_async, FetchResponseMsg, FetchMetadata, Metadata};
use net_traits::image::base::{Image, ImageMetadata, PixelFormat, load_from_memory}; use net_traits::image::base::{Image, ImageMetadata, PixelFormat, load_from_memory};
use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheCommand, ImageCacheThread, ImageState}; use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheCommand, ImageCacheThread, ImageState};
use net_traits::image_cache_thread::{ImageCacheResult, ImageOrMetadataAvailable, ImageResponse, UsePlaceholder}; use net_traits::image_cache_thread::{ImageCacheResult, ImageOrMetadataAvailable, ImageResponse, UsePlaceholder};
@ -225,6 +225,15 @@ impl ImageListener {
} }
} }
/// A legacy type that's mostly redundant with FetchResponseMsg.
// FIXME(#13717): remove this type.
#[derive(Deserialize, Serialize)]
enum ResponseAction {
HeadersAvailable(Result<Metadata, NetworkError>),
DataAvailable(Vec<u8>),
ResponseComplete(Result<(), NetworkError>)
}
struct ResourceLoadInfo { struct ResourceLoadInfo {
action: ResponseAction, action: ResponseAction,
key: LoadKey, key: LoadKey,

12
components/net_traits/lib.rs
View file

@ -263,18 +263,6 @@ pub trait Action<Listener> {
fn process(self, listener: &mut Listener); fn process(self, listener: &mut Listener);
} }
/// Data for passing between threads/processes to indicate a particular action to
/// take on a provided network listener.
#[derive(Deserialize, Serialize)]
pub enum ResponseAction {
/// Invoke headers_available
HeadersAvailable(Result<Metadata, NetworkError>),
/// Invoke data_available
DataAvailable(Vec<u8>),
/// Invoke response_complete
ResponseComplete(Result<(), NetworkError>)
}
impl<T: FetchResponseListener> Action<T> for FetchResponseMsg { impl<T: FetchResponseListener> Action<T> for FetchResponseMsg {
/// Execute the default action on a provided listener. /// Execute the default action on a provided listener.
fn process(self, listener: &mut T) { fn process(self, listener: &mut T) {