Auto merge of #8155 - Ms2ger:join, r=jdm

Remove Window::layout_join_port.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8155)
<!-- Reviewable:end -->

1 files changed, 4 insertions, 23 deletions

diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 2b6f4c252d6..802d8aa8d3e 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -713,12 +713,10 @@ impl ScriptTask {
                 for page in page.iter() {
                     // Only process a resize if layout is idle.
                     let window = page.window();
-                    if window.r().layout_is_idle() {
-                        let resize_event = window.r().steal_resize_event();
-                        match resize_event {
-                            Some(size) => resizes.push((window.r().pipeline(), size)),
-                            None => ()
-                        }
+                    let resize_event = window.r().steal_resize_event();
+                    match resize_event {
+                        Some(size) => resizes.push((window.r().pipeline(), size)),
+                        None => ()
                     }
                 }
             }
@@ -938,8 +936,6 @@ impl ScriptTask {
                 self.handle_navigate(pipeline_id, Some(subpage_id), load_data),
             ConstellationControlMsg::SendEvent(id, event) =>
                 self.handle_event(id, event),
-            ConstellationControlMsg::ReflowComplete(id, reflow_id) =>
-                self.handle_reflow_complete_msg(id, reflow_id),
             ConstellationControlMsg::ResizeInactive(id, new_size) =>
                 self.handle_resize_inactive_msg(id, new_size),
             ConstellationControlMsg::Viewport(..) =>
@@ -1386,21 +1382,6 @@ impl ScriptTask {
         frame_element.r().unwrap().update_subpage_id(new_subpage_id);
     }
 
-    /// Handles a notification that reflow completed.
-    fn handle_reflow_complete_msg(&self, pipeline_id: PipelineId, reflow_id: u32) {
-        debug!("Script: Reflow {:?} complete for {:?}", reflow_id, pipeline_id);
-        let page = self.root_page();
-        match page.find(pipeline_id) {
-            Some(page) => {
-                let window = page.window();
-                window.r().handle_reflow_complete_msg(reflow_id);
-            }
-            None => {
-                assert!(self.closed_pipelines.borrow().contains(&pipeline_id));
-            }
-        }
-    }
-
     /// Window was resized, but this script was not active, so don't reflow yet
     fn handle_resize_inactive_msg(&self, id: PipelineId, new_size: WindowSizeData) {
         let page = self.root_page();