Revert "frame-resize refactor"

This reverts commit bca565a.

components/compositing/compositor.rs

@@ -342,13 +342,15 @@ fn initialize_png(width: usize, height: usize) -> RenderTargetInfo {
 
 struct RenderNotifier {
     compositor_proxy: Box<CompositorProxy>,
+    constellation_chan: Sender<ConstellationMsg>,
 }
 
 impl RenderNotifier {
     fn new(compositor_proxy: Box<CompositorProxy>,
-           _: Sender<ConstellationMsg>) -> RenderNotifier {
+           constellation_chan: Sender<ConstellationMsg>) -> RenderNotifier {
         RenderNotifier {
             compositor_proxy: compositor_proxy,
+            constellation_chan: constellation_chan,
         }
     }
 }
@@ -363,8 +365,16 @@ impl webrender_traits::RenderNotifier for RenderNotifier {
     }
 
     fn pipeline_size_changed(&mut self,
-                             _: webrender_traits::PipelineId,
-                             _: Option<webrender_traits::LayoutSize>) {
+                             pipeline_id: webrender_traits::PipelineId,
+                             size: Option<webrender_traits::LayoutSize>) {
+        let pipeline_id = pipeline_id.from_webrender();
+
+        if let Some(size) = size {
+            let msg = ConstellationMsg::FrameSize(pipeline_id, size.to_untyped());
+            if let Err(e) = self.constellation_chan.send(msg) {
+                warn!("Compositor resize to constellation failed ({}).", e);
+            }
+        }
     }
 }
 

components/constellation/constellation.rs

@@ -817,6 +817,12 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
                 debug!("constellation exiting");
                 self.handle_exit();
             }
+            // The compositor discovered the size of a subframe. This needs to be reflected by all
+            // frame trees in the navigation context containing the subframe.
+            FromCompositorMsg::FrameSize(pipeline_id, size) => {
+                debug!("constellation got frame size message");
+                self.handle_frame_size_msg(pipeline_id, &TypedSize2D::from_untyped(&size));
+            }
             FromCompositorMsg::GetFrame(pipeline_id, resp_chan) => {
                 debug!("constellation got get root pipeline message");
                 self.handle_get_frame(pipeline_id, resp_chan);
@@ -1083,12 +1089,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
             FromLayoutMsg::ChangeRunningAnimationsState(pipeline_id, animation_state) => {
                 self.handle_change_running_animations_state(pipeline_id, animation_state)
             }
-            // Layout sends new sizes for all subframes. This needs to be reflected by all
-            // frame trees in the navigation context containing the subframe.
-            FromLayoutMsg::FrameSizes(iframe_sizes) => {
-                debug!("constellation got frame size message");
-                self.handle_frame_size_msg(iframe_sizes);
-            }
             FromLayoutMsg::SetCursor(cursor) => {
                 self.handle_set_cursor_msg(cursor)
             }
@@ -1327,27 +1327,30 @@ 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) {
+                             pipeline_id: PipelineId,
+                             size: &TypedSize2D<f32, PagePx>) {
+        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);
+
+        // Store the new rect inside the pipeline
+        let result = {
+            // Find the pipeline that corresponds to this rectangle. It's possible that this
+            // pipeline may have already exited before we process this message, so just
+            // early exit if that occurs.
+            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);
+                    pipeline.event_loop.send(msg)
                 }
-                None => None
-            };
-            if let Some(Err(e)) = result {
-                self.handle_send_error(pipeline_id, e);
+                None => return,
             }
+        };
+
+        if let Err(e) = result {
+            self.handle_send_error(pipeline_id, e);
         }
     }
 

components/layout/display_list_builder.rs

@@ -14,7 +14,7 @@ use app_units::{AU_PER_PX, Au};
 use block::{BlockFlow, BlockStackingContextType};
 use canvas_traits::{CanvasData, CanvasMsg, FromLayoutMsg};
 use context::SharedLayoutContext;
-use euclid::{Point2D, Rect, SideOffsets2D, Size2D, TypedSize2D};
+use euclid::{Point2D, Rect, SideOffsets2D, Size2D};
 use flex::FlexFlow;
 use flow::{BaseFlow, Flow, IS_ABSOLUTELY_POSITIONED};
 use flow_ref::FlowRef;
@@ -32,7 +32,6 @@ use inline::{FIRST_FRAGMENT_OF_ELEMENT, InlineFlow, LAST_FRAGMENT_OF_ELEMENT};
 use ipc_channel::ipc;
 use list_item::ListItemFlow;
 use model::{self, MaybeAuto};
-use msg::constellation_msg::PipelineId;
 use net_traits::image::base::PixelFormat;
 use net_traits::image_cache_thread::UsePlaceholder;
 use range::Range;
@@ -57,7 +56,6 @@ use style::servo::restyle_damage::REPAINT;
 use style::values::{RGBA, computed};
 use style::values::computed::{AngleOrCorner, Gradient, GradientKind, LengthOrPercentage, LengthOrPercentageOrAuto};
 use style::values::specified::{HorizontalDirection, VerticalDirection};
-use style_traits::PagePx;
 use style_traits::cursor::Cursor;
 use table_cell::CollapsedBordersForCell;
 use webrender_traits::{ColorF, GradientStop, ScrollPolicy};
@@ -107,10 +105,6 @@ pub struct DisplayListBuildState<'a> {
     /// The current scroll root id, used to keep track of state when
     /// recursively building and processing the display list.
     pub current_scroll_root_id: ScrollRootId,
-
-    /// Vector containing iframe sizes, used to inform the constellation about
-    /// new iframe sizes
-    pub iframe_sizes: Vec<(PipelineId, TypedSize2D<f32, PagePx>)>,
 }
 
 impl<'a> DisplayListBuildState<'a> {
@@ -124,7 +118,6 @@ impl<'a> DisplayListBuildState<'a> {
             processing_scroll_root_element: false,
             current_stacking_context_id: StackingContextId::root(),
             current_scroll_root_id: ScrollRootId::root(),
-            iframe_sizes: Vec::new(),
         }
     }
 
@@ -1450,10 +1443,6 @@ impl FragmentDisplayListBuilding for Fragment {
                         iframe: fragment_info.pipeline_id,
                     });
 
-                    let size = Size2D::new(item.bounds().size.width.to_f32_px(),
-                                           item.bounds().size.height.to_f32_px());
-                    state.iframe_sizes.push((fragment_info.pipeline_id, TypedSize2D::from_untyped(&size)));
-
                     state.add_display_item(item);
                 }
             }

components/layout_thread/lib.rs

@@ -936,17 +936,6 @@ impl LayoutThread {
                         let origin = Rect::new(Point2D::new(Au(0), Au(0)), root_size);
                         build_state.root_stacking_context.bounds = origin;
                         build_state.root_stacking_context.overflow = origin;
-
-                        if !build_state.iframe_sizes.is_empty() {
-                            // build_state.iframe_sizes is only used here, so its okay to replace
-                            // it with an empty vector
-                            let iframe_sizes = std::mem::replace(&mut build_state.iframe_sizes, vec![]);
-                            let msg = ConstellationMsg::FrameSizes(iframe_sizes);
-                            if let Err(e) = self.constellation_chan.send(msg) {
-                                warn!("Layout resize to constellation failed ({}).", e);
-                            }
-                        }
-
                         rw_data.display_list = Some(Arc::new(build_state.to_display_list()));
                     }
                     (ReflowGoal::ForScriptQuery, false) => {}

components/script_traits/lib.rs

@@ -696,6 +696,8 @@ pub enum WebDriverCommandMsg {
 pub enum ConstellationMsg {
     /// Exit the constellation.
     Exit,
+    /// Inform the constellation of the size of the viewport.
+    FrameSize(PipelineId, Size2D<f32>),
     /// Request that the constellation send the FrameId corresponding to the document
     /// with the provided pipeline id
     GetFrame(PipelineId, IpcSender<Option<FrameId>>),

components/script_traits/script_msg.rs

@@ -15,7 +15,7 @@ use WorkerScriptLoadOrigin;
 use canvas_traits::CanvasMsg;
 use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId};
 use euclid::point::Point2D;
-use euclid::size::{Size2D, TypedSize2D};
+use euclid::size::Size2D;
 use gfx_traits::ScrollRootId;
 use ipc_channel::ipc::IpcSender;
 use msg::constellation_msg::{FrameId, PipelineId, TraversalDirection};
@@ -24,7 +24,6 @@ use net_traits::CoreResourceMsg;
 use net_traits::storage_thread::StorageType;
 use offscreen_gl_context::{GLContextAttributes, GLLimits};
 use servo_url::ServoUrl;
-use style_traits::PagePx;
 use style_traits::cursor::Cursor;
 use style_traits::viewport::ViewportConstraints;
 
@@ -33,8 +32,6 @@ use style_traits::viewport::ViewportConstraints;
 pub enum LayoutMsg {
     /// Indicates whether this pipeline is currently running animations.
     ChangeRunningAnimationsState(PipelineId, AnimationState),
-    /// Inform the constellation of the size of the pipeline's viewport.
-    FrameSizes(Vec<(PipelineId, TypedSize2D<f32, PagePx>)>),
     /// Requests that the constellation inform the compositor of the a cursor change.
     SetCursor(Cursor),
     /// Notifies the constellation that the viewport has been constrained in some manner