constellation: Cleanup the frame size handler.

This is a followup to #15129, addressing my last review comment.
This commit is contained in:
Emilio Cobos Álvarez 2017-01-23 17:07:02 +01:00
parent 7e2329ea4e
commit 79ef2067cd
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C

View file

@ -1329,23 +1329,26 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
fn handle_frame_size_msg(&mut self,
iframe_sizes: Vec<(PipelineId, TypedSize2D<f32, PagePx>)>) {
for (pipeline_id, size) in iframe_sizes {
let result = match self.pipelines.get_mut(&pipeline_id) {
Some(pipeline) => {
if pipeline.size != Some(size) {
pipeline.size = Some(size);
let msg = ConstellationControlMsg::Resize(pipeline_id, WindowSizeData {
visible_viewport: size,
initial_viewport: size * ScaleFactor::new(1.0),
device_pixel_ratio: self.window_size.device_pixel_ratio,
}, WindowSizeType::Initial);
Some(pipeline.event_loop.send(msg))
} else {
None
}
let result = {
let pipeline = match self.pipelines.get_mut(&pipeline_id) {
Some(pipeline) => pipeline,
None => continue,
};
if pipeline.size == Some(size) {
continue;
}
None => None
pipeline.size = Some(size);
let msg = ConstellationControlMsg::Resize(pipeline_id, WindowSizeData {
visible_viewport: size,
initial_viewport: size * ScaleFactor::new(1.0),
device_pixel_ratio: self.window_size.device_pixel_ratio,
}, WindowSizeType::Initial);
pipeline.event_loop.send(msg)
};
if let Some(Err(e)) = result {
if let Err(e) = result {
self.handle_send_error(pipeline_id, e);
}
}