diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-03-21 12:57:46 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-03-21 12:57:46 -0600 |
commit | 43f3f6c897916aea75773f74060ec84a338834d0 (patch) | |
tree | 6a7b6b4d0a28f0302029f0c82ab3c63290287d6e /components/net/image_cache_task.rs | |
parent | 29a36adbe7d87fb38ba9bef3a718c6c823fb5977 (diff) | |
parent | ba87666cdbf4addf9340aad0dd0cf9574b79091c (diff) | |
download | servo-43f3f6c897916aea75773f74060ec84a338834d0.tar.gz servo-43f3f6c897916aea75773f74060ec84a338834d0.zip |
auto merge of #5303 : Ms2ger/servo/core, r=jdm
Diffstat (limited to 'components/net/image_cache_task.rs')
-rw-r--r-- | components/net/image_cache_task.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/net/image_cache_task.rs b/components/net/image_cache_task.rs index 16d390bf6d1..ecb6b4ae396 100644 --- a/components/net/image_cache_task.rs +++ b/components/net/image_cache_task.rs @@ -316,7 +316,7 @@ impl ImageCache { debug!("image_cache_task: started image decode for {}", url.serialize()); let image = profile(time::TimeProfilerCategory::ImageDecoding, None, time_profiler_chan, || { - load_from_memory(data.as_slice()) + load_from_memory(&data) }); let image = image.map(|image| Arc::new(box image)); @@ -456,7 +456,7 @@ fn load_image_data(url: Url, resource_task: ResourceTask) -> Result<Vec<u8>, ()> loop { match progress_port.recv().unwrap() { Payload(data) => { - image_data.push_all(data.as_slice()); + image_data.push_all(&data); } Done(Ok(..)) => { return Ok(image_data); |