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

Remove-ResponseAction

Browse source 
Remove redundant code
This commit is contained in:
deror1869107 2016-12-14 23:29:18 +08:00
parent cd1d5f1cf3
commit 55dddc8c41
1 changed files with 9 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

38
components/net/image_cache_thread.rs
View file

@ -225,17 +225,8 @@ 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: FetchResponseMsg,
key: LoadKey, key: LoadKey,
} }
@ -417,8 +408,10 @@ impl ImageCache {
// Handle progress messages from the resource thread // Handle progress messages from the resource thread
fn handle_progress(&mut self, msg: ResourceLoadInfo) { fn handle_progress(&mut self, msg: ResourceLoadInfo) {
match (msg.action, msg.key) { match (msg.action, msg.key) {
(ResponseAction::HeadersAvailable(_), _) => {} (FetchResponseMsg::ProcessRequestBody, _) |
(ResponseAction::DataAvailable(data), _) => { (FetchResponseMsg::ProcessRequestEOF, _) => return,
(FetchResponseMsg::ProcessResponse(_), _) => {}
(FetchResponseMsg::ProcessResponseChunk(data), _) => {
let pending_load = self.pending_loads.get_by_key_mut(&msg.key).unwrap(); let pending_load = self.pending_loads.get_by_key_mut(&msg.key).unwrap();
pending_load.bytes.extend_from_slice(&data); pending_load.bytes.extend_from_slice(&data);
//jmr0 TODO: possibly move to another task? //jmr0 TODO: possibly move to another task?
@ -434,7 +427,7 @@ impl ImageCache {
} }
} }
} }
(ResponseAction::ResponseComplete(result), key) => { (FetchResponseMsg::ProcessResponseEOF(result), key) => {
match result { match result {
Ok(()) => { Ok(()) => {
let pending_load = self.pending_loads.get_by_key_mut(&msg.key).unwrap(); let pending_load = self.pending_loads.get_by_key_mut(&msg.key).unwrap();
@ -550,20 +543,7 @@ impl ImageCache {
let action = match action { let action = match action {
FetchResponseMsg::ProcessRequestBody | FetchResponseMsg::ProcessRequestBody |
FetchResponseMsg::ProcessRequestEOF => return, FetchResponseMsg::ProcessRequestEOF => return,
FetchResponseMsg::ProcessResponse(meta_result) => { a => a
ResponseAction::HeadersAvailable(meta_result.map(|m| {
match m {
FetchMetadata::Unfiltered(m) => m,
FetchMetadata::Filtered { unsafe_, .. } => unsafe_
}
}))
}
FetchResponseMsg::ProcessResponseChunk(new_bytes) => {
ResponseAction::DataAvailable(new_bytes)
}
FetchResponseMsg::ProcessResponseEOF(response) => {
ResponseAction::ResponseComplete(response)
}
}; };
progress_sender.send(ResourceLoadInfo { progress_sender.send(ResourceLoadInfo {
action: action, action: action,
@ -630,12 +610,12 @@ impl ImageCache {
loaded_bytes: Vec<u8>) { loaded_bytes: Vec<u8>) {
let (cache_result, load_key, _) = self.pending_loads.get_cached(ref_url.clone()); let (cache_result, load_key, _) = self.pending_loads.get_cached(ref_url.clone());
assert!(cache_result == CacheResult::Miss); assert!(cache_result == CacheResult::Miss);
let action = ResponseAction::DataAvailable(loaded_bytes); let action = FetchResponseMsg::ProcessResponseChunk(loaded_bytes);
let _ = self.progress_sender.send(ResourceLoadInfo { let _ = self.progress_sender.send(ResourceLoadInfo {
action: action, action: action,
key: load_key, key: load_key,
}); });
let action = ResponseAction::ResponseComplete(Ok(())); let action = FetchResponseMsg::ProcessResponseEOF(Ok(()));
let _ = self.progress_sender.send(ResourceLoadInfo { let _ = self.progress_sender.send(ResourceLoadInfo {
action: action, action: action,
key: load_key, key: load_key,