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

image_cache_task::new_image_cache_task() should not panic when placeholder fails to load

Browse source 
now we just print a message and continue
This commit is contained in:
Mike Blumenkrantz 2015-05-08 12:54:06 -04:00
parent 6e74e510c6
commit f588c0be73
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/net/image_cache_task.rs
View file

@ -331,8 +331,9 @@ pub fn new_image_cache_task(resource_task: ResourceTask) -> ImageCacheTask {
let mut placeholder_url = resources_dir_path(); let mut placeholder_url = resources_dir_path();
// TODO (Savago): replace for a prettier one. // TODO (Savago): replace for a prettier one.
placeholder_url.push("rippy.jpg"); placeholder_url.push("rippy.jpg");
let url = Url::from_file_path(&*placeholder_url).unwrap(); let placeholder_image = match Url::from_file_path(&*placeholder_url) {
let placeholder_image = match load_whole_resource(&resource_task, url) { Ok(url) => {
match load_whole_resource(&resource_task, url) {
Err(..) => { Err(..) => {
debug!("image_cache_task: failed loading the placeholder."); debug!("image_cache_task: failed loading the placeholder.");
None None
@ -340,6 +341,12 @@ pub fn new_image_cache_task(resource_task: ResourceTask) -> ImageCacheTask {
Ok((_, image_data)) => { Ok((_, image_data)) => {
Some(Arc::new(load_from_memory(&image_data).unwrap())) Some(Arc::new(load_from_memory(&image_data).unwrap()))
} }
}
}
Err(..) => {
debug!("image_cache_task: url {}", placeholder_url.display());
None
}
}; };
let mut cache = ImageCache { let mut cache = ImageCache {