mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Simplify handle_load_start_msg function
This commit is contained in:
parent
ad5846f2e1
commit
6413526440
1 changed files with 7 additions and 15 deletions
|
@ -689,19 +689,11 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn handle_load_start_msg(&mut self, pipeline_id: &PipelineId) {
|
fn handle_load_start_msg(&mut self, pipeline_id: &PipelineId) {
|
||||||
let mut back;
|
if let Some(id) = self.pipeline_to_frame_map.get(pipeline_id) {
|
||||||
let mut forward;
|
let forward = !self.frame(*id).next.is_empty();
|
||||||
let frameid = self.pipeline_to_frame_map.get(pipeline_id);
|
let back = !self.frame(*id).prev.is_empty();
|
||||||
match frameid {
|
self.compositor_proxy.send(CompositorMsg::LoadStart(back, forward));
|
||||||
Some(frame_id) => {
|
}
|
||||||
forward = if !self.frame(*frame_id).next.is_empty() { true }
|
|
||||||
else { false };
|
|
||||||
back = if !self.frame(*frame_id).prev.is_empty() { true }
|
|
||||||
else { false };
|
|
||||||
},
|
|
||||||
None => return
|
|
||||||
};
|
|
||||||
self.compositor_proxy.send(CompositorMsg::LoadStart(back, forward));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn handle_load_complete_msg(&mut self, pipeline_id: &PipelineId) {
|
fn handle_load_complete_msg(&mut self, pipeline_id: &PipelineId) {
|
||||||
|
@ -710,8 +702,8 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
|
||||||
None => return
|
None => return
|
||||||
};
|
};
|
||||||
|
|
||||||
let forward = !self.mut_frame(frame_id).next.is_empty();
|
let forward = !self.frame(frame_id).next.is_empty();
|
||||||
let back = !self.mut_frame(frame_id).prev.is_empty();
|
let back = !self.frame(frame_id).prev.is_empty();
|
||||||
self.compositor_proxy.send(CompositorMsg::LoadComplete(back, forward));
|
self.compositor_proxy.send(CompositorMsg::LoadComplete(back, forward));
|
||||||
|
|
||||||
let mut webdriver_reset = false;
|
let mut webdriver_reset = false;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue