Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "constellation: Cleanup the frame size handler."

Browse source 
This reverts commit 79ef2067cd.
This commit is contained in:
Matt Brubeck 2017-01-23 16:43:33 -08:00
parent 7595a90221
commit 58e8ae8607
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

33
components/constellation/constellation.rs
View file

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