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

Auto merge of #5985 - zmike:embedding-woodenbikeshed, r=larsbergstrom

Browse source 
Some small changes.

@larsbergstrom or whoever cares the most at this exact moment.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5985)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-08 15:03:52 -05:00
commit 892a740426
5 changed files with 53 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/net/image_cache_task.rs
View file

@ -330,14 +330,21 @@ pub fn new_image_cache_task(resource_task: ResourceTask) -> ImageCacheTask {
// Preload the placeholder image, used when images fail to load.
let mut placeholder_url = resources_dir_path();
placeholder_url.push("rippy.jpg");
let url = Url::from_file_path(&*placeholder_url).unwrap();
let placeholder_image = match load_whole_resource(&resource_task, url) {
Err(..) => {
debug!("image_cache_task: failed loading the placeholder.");
None
let placeholder_image = match Url::from_file_path(&*placeholder_url) {
Ok(url) => {
match load_whole_resource(&resource_task, url) {
Err(..) => {
debug!("image_cache_task: failed loading the placeholder.");
None
}
Ok((_, image_data)) => {
Some(Arc::new(load_from_memory(&image_data).unwrap()))
}
}
}
Ok((_, image_data)) => {
Some(Arc::new(load_from_memory(&image_data).unwrap()))
Err(..) => {
debug!("image_cache_task: url {}", placeholder_url.display());
None
}
};