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

Auto merge of #9159 - saneyuki:9158, r=jdm

Browse source 
gfx: handle the ResponseAction::ResponseComplete error case in font_cache_task

Fix #9158

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9159)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-01-06 02:29:26 +05:30
commit e3dd36f0f3
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/gfx/font_cache_task.rs
View file

@ -185,14 +185,13 @@ impl FontCache {
metadata.content_type);
*response_valid.lock().unwrap() = is_response_valid;
}
ResponseAction::ResponseComplete(Err(_)) => {}
ResponseAction::DataAvailable(new_bytes) => {
if *response_valid.lock().unwrap() {
bytes.lock().unwrap().extend(new_bytes.into_iter())
}
}
ResponseAction::ResponseComplete(Ok(_)) => {
if !*response_valid.lock().unwrap() {
ResponseAction::ResponseComplete(response) => {
if response.is_err() || !*response_valid.lock().unwrap() {
drop(result.send(()));
return;
}