diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-27 03:24:38 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-27 03:24:38 +0530 |
commit | 941653da653a1925ade35597e97f61a6a8a0018d (patch) | |
tree | 0f47932193d04177440e79fb96b41eeb5569aa04 /components/script/dom | |
parent | d2e7fd82213a6b2df6703dc6f9ace70e49762c5a (diff) | |
parent | 655268d1117c81b05721f65ca5ee7a0ed2670986 (diff) | |
download | servo-941653da653a1925ade35597e97f61a6a8a0018d.tar.gz servo-941653da653a1925ade35597e97f61a6a8a0018d.zip |
Auto merge of #8958 - jkachmar:separate-layout-msg, r=KiChjang
Separate script and layout messages, issue #8843
Separated layout-specific messages to the constellation out from the `ScriptMsg` enum into a `LayoutMsg` enum within `script_traits/script_msg.rs`, addresses [#8843](https://github.com/servo/servo/issues/8843).
I initially tried to move `LayoutMsg` into `layout_traits/lib.rs`, but this introduced a cyclic dependency: `layout_traits` depends on `script_traits` for the `LayoutTaskFactory` implementation, and `script_traits/script_task.rs` now depends on `LayoutMsg` for new layout channels in `InitialScriptState` and `ScriptTask`.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8958)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/bindings/trace.rs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index cbe870f073c..496d70add18 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -63,7 +63,7 @@ use net_traits::storage_task::StorageType; use profile_traits::mem::ProfilerChan as MemProfilerChan; use profile_traits::time::ProfilerChan as TimeProfilerChan; use script_task::ScriptChan; -use script_traits::{ScriptMsg, TimerEventId, TimerSource, UntrustedNodeAddress}; +use script_traits::{LayoutMsg, ScriptMsg, TimerEventId, TimerSource, UntrustedNodeAddress}; use selectors::parser::PseudoElement; use selectors::states::*; use serde::{Deserialize, Serialize}; @@ -306,6 +306,13 @@ impl JSTraceable for ConstellationChan<ScriptMsg> { } } +impl JSTraceable for ConstellationChan<LayoutMsg> { + #[inline] + fn trace(&self, _trc: *mut JSTracer) { + // Do nothing + } +} + impl JSTraceable for Box<ScriptChan + Send> { #[inline] fn trace(&self, _trc: *mut JSTracer) { |