mirror of
https://github.com/servo/servo.git
synced 2025-07-31 19:20:22 +01:00
Inline ImageCache::do_run.
This commit is contained in:
parent
9c4f2265d0
commit
9c75ddfe66
1 changed files with 7 additions and 11 deletions
|
@ -327,17 +327,13 @@ impl ImageCache {
|
||||||
webrender_api: webrender_api,
|
webrender_api: webrender_api,
|
||||||
};
|
};
|
||||||
|
|
||||||
cache.do_run();
|
|
||||||
}
|
|
||||||
|
|
||||||
fn do_run(&mut self) {
|
|
||||||
let mut exit_sender: Option<IpcSender<()>> = None;
|
let mut exit_sender: Option<IpcSender<()>> = None;
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let result = {
|
let result = {
|
||||||
let cmd_receiver = &self.cmd_receiver;
|
let cmd_receiver = &cache.cmd_receiver;
|
||||||
let progress_receiver = &self.progress_receiver;
|
let progress_receiver = &cache.progress_receiver;
|
||||||
let decoder_receiver = &self.decoder_receiver;
|
let decoder_receiver = &cache.decoder_receiver;
|
||||||
|
|
||||||
select! {
|
select! {
|
||||||
msg = cmd_receiver.recv() => {
|
msg = cmd_receiver.recv() => {
|
||||||
|
@ -354,19 +350,19 @@ impl ImageCache {
|
||||||
|
|
||||||
match result {
|
match result {
|
||||||
SelectResult::Command(cmd) => {
|
SelectResult::Command(cmd) => {
|
||||||
exit_sender = self.handle_cmd(cmd);
|
exit_sender = cache.handle_cmd(cmd);
|
||||||
}
|
}
|
||||||
SelectResult::Progress(msg) => {
|
SelectResult::Progress(msg) => {
|
||||||
self.handle_progress(msg);
|
cache.handle_progress(msg);
|
||||||
}
|
}
|
||||||
SelectResult::Decoder(msg) => {
|
SelectResult::Decoder(msg) => {
|
||||||
self.handle_decoder(msg);
|
cache.handle_decoder(msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Can only exit when all pending loads are complete.
|
// Can only exit when all pending loads are complete.
|
||||||
if let Some(ref exit_sender) = exit_sender {
|
if let Some(ref exit_sender) = exit_sender {
|
||||||
if self.pending_loads.is_empty() {
|
if cache.pending_loads.is_empty() {
|
||||||
exit_sender.send(()).unwrap();
|
exit_sender.send(()).unwrap();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue