diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-29 12:42:01 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-29 12:42:01 +0530 |
| commit | aac2da75f40f4c55a4b450b6d9d134429fcf741e (patch) | |
| tree | 46b3d933d44726121af4f4079a80282b7b73018e /components/script_traits/script_msg.rs | |
| parent | ddc57fe641c3940ecdad98297ac5b2ff95c3340c (diff) | |
| parent | a5a299ea881cc589511f8a03f63d53f4b39cdf66 (diff) | |
| download | servo-aac2da75f40f4c55a4b450b6d9d134429fcf741e.tar.gz servo-aac2da75f40f4c55a4b450b6d9d134429fcf741e.zip | |
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 -->
Diffstat (limited to 'components/script_traits/script_msg.rs')
| -rw-r--r-- | components/script_traits/script_msg.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs index 5b6afa3db1e..7c82de027bf 100644 --- a/components/script_traits/script_msg.rs +++ b/components/script_traits/script_msg.rs @@ -74,7 +74,7 @@ pub enum ScriptMsg { /// Status message to be displayed in the chrome, eg. a link URL on mouseover. NodeStatus(Option<String>), /// Notification that this iframe should be removed. - RemoveIFrame(PipelineId), + RemoveIFrame(PipelineId, Option<IpcSender<()>>), /// A load has been requested in an IFrame. ScriptLoadedURLInIFrame(IFrameLoadInfo), /// Requests that the constellation set the contents of the clipboard |