Revert "constellation: Cleanup the frame size handler."

This reverts commit 79ef206.
servo · Jan 24, 2017 · 58e8ae8 · 58e8ae8
1 parent 7595a90
commit 58e8ae8
Showing 1 changed file with 15 additions and 18 deletions.
diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
@@ -1329,26 +1329,23 @@ 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 = {
-                let pipeline = match self.pipelines.get_mut(&pipeline_id) {
-                    Some(pipeline) => pipeline,
-                    None => continue,
-                };
-
-                if pipeline.size == Some(size) {
-                    continue;
+            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
+                    }
                 }
-
-                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)
+                None => None
             };
-            if let Err(e) = result {
+            if let Some(Err(e)) = result {
                 self.handle_send_error(pipeline_id, e);
             }
         }