aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_traits/lib.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-05-25 09:26:04 -0500
committerbors-servo <lbergstrom+bors@mozilla.com>2016-05-25 09:26:04 -0500
commitf03e8fc937b5bc5b22c2595ffd17bee41a825b5f (patch)
treeafd1dbffa77c28421020842b6ef58868c22f5f5c /components/script_traits/lib.rs
parentee299b5e9efa394c0a67f0df7644ef2897705123 (diff)
parent4f893ee96e92ebbf50409ac451b6ab4eb344f68c (diff)
downloadservo-f03e8fc937b5bc5b22c2595ffd17bee41a825b5f.tar.gz
servo-f03e8fc937b5bc5b22c2595ffd17bee41a825b5f.zip
Auto merge of #11375 - servo:layout_to_constellation_chan, r=mbrubeck
Remove ScriptThread::layout_to_constellation_chan. Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy --faster` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). Either: - [ ] There are tests for these changes OR - [x] These changes do not require tests because refactoring Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. Instead, pass it along in NewLayoutInfo when needed. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11375) <!-- Reviewable:end -->
Diffstat (limited to 'components/script_traits/lib.rs')
-rw-r--r--components/script_traits/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs
index d8f053eb54d..ae860a92122 100644
--- a/components/script_traits/lib.rs
+++ b/components/script_traits/lib.rs
@@ -100,6 +100,8 @@ pub struct NewLayoutInfo {
pub pipeline_port: IpcReceiver<LayoutControlMsg>,
/// A channel for sending panics on
pub panic_chan: IpcSender<PanicMsg>,
+ /// A sender for the layout thread to communicate to the constellation.
+ pub layout_to_constellation_chan: IpcSender<LayoutMsg>,
/// A shutdown channel so that layout can notify others when it's done.
pub layout_shutdown_chan: IpcSender<()>,
/// A shutdown channel so that layout can tell the content process to shut down when it's done.
@@ -310,8 +312,6 @@ pub struct InitialScriptState {
pub control_port: IpcReceiver<ConstellationControlMsg>,
/// A channel on which messages can be sent to the constellation from script.
pub constellation_chan: IpcSender<ScriptMsg>,
- /// A channel for the layout thread to send messages to the constellation.
- pub layout_to_constellation_chan: IpcSender<LayoutMsg>,
/// A channel for sending panics to the constellation.
pub panic_chan: IpcSender<PanicMsg>,
/// A channel to schedule timer events.