diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-06 02:29:26 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-06 02:29:26 +0530 |
| commit | e3dd36f0f3cb894d0eacedc99134e715135882bf (patch) | |
| tree | 41e08f80330fb013f9a8b69cec1b4b907e94beed | |
| parent | 4ab1cdece6f594512a0ae9605ff5ebee630a70ca (diff) | |
| parent | 574f93431417011c93402f58a500cdc840297d67 (diff) | |
| download | servo-e3dd36f0f3cb894d0eacedc99134e715135882bf.tar.gz servo-e3dd36f0f3cb894d0eacedc99134e715135882bf.zip | |
Auto merge of #9159 - saneyuki:9158, r=jdm
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 -->
| -rw-r--r-- | components/gfx/font_cache_task.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/components/gfx/font_cache_task.rs b/components/gfx/font_cache_task.rs index cfa53a3d119..6c4b893e6e9 100644 --- a/components/gfx/font_cache_task.rs +++ b/components/gfx/font_cache_task.rs @@ -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; } |