Auto merge of #8641 - notriddle:no_headless, r=glennw

No more headless compositor. Just the normal one.

Fixes #8573

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

1 files changed, 23 insertions, 1 deletions

diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index a4ccafd2d4c..4e7e6108785 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -28,6 +28,7 @@ use dom::node::{Node, UnbindContext, window_from_node, document_from_node};
 use dom::urlhelper::UrlHelper;
 use dom::virtualmethods::VirtualMethods;
 use dom::window::{ReflowReason, Window};
+use ipc_channel::ipc;
 use js::jsapi::{JSAutoCompartment, JSAutoRequest, RootedValue, JSContext, MutableHandleValue};
 use js::jsval::{UndefinedValue, NullValue};
 use layout_interface::ReflowQueryType;
@@ -559,9 +560,30 @@ impl VirtualMethods for HTMLIFrameElement {
             let window = window_from_node(self);
             let window = window.r();
 
+            // The only reason we're waiting for the iframe to be totally
+            // removed is to ensure the script thread can't add iframes faster
+            // than the compositor can remove them.
+            //
+            // Since most of this cleanup doesn't happen on same-origin
+            // iframes, and since that would cause a deadlock, don't do it.
             let ConstellationChan(ref chan) = window.constellation_chan();
-            let msg = ConstellationMsg::RemoveIFrame(pipeline_id);
+            let same_origin = if let Some(self_url) = self.get_url() {
+                let win_url = window_from_node(self).get_url();
+                UrlHelper::SameOrigin(&self_url, &win_url)
+            } else {
+                false
+            };
+            let (sender, receiver) = if same_origin {
+                (None, None)
+            } else {
+                let (sender, receiver) = ipc::channel().unwrap();
+                (Some(sender), Some(receiver))
+            };
+            let msg = ConstellationMsg::RemoveIFrame(pipeline_id, sender);
             chan.send(msg).unwrap();
+            if let Some(receiver) = receiver {
+                receiver.recv().unwrap()
+            }
 
             // Resetting the subpage id to None is required here so that
             // if this iframe is subsequently re-added to the document