diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-20 03:59:48 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-20 03:59:48 +0530 |
| commit | 8b39b9afed6ef8a3d7d3e6609fd301a37825d3e1 (patch) | |
| tree | f4e69760ac67f67dfbfbd8c5819481f1333edcb2 /components/script/dom | |
| parent | e5c9b4859870ab7dcb6a5137ac5106088ccc3872 (diff) | |
| parent | 1c130819ca6fdcef66495ea3dabf9d9575774d52 (diff) | |
| download | servo-8b39b9afed6ef8a3d7d3e6609fd301a37825d3e1.tar.gz servo-8b39b9afed6ef8a3d7d3e6609fd301a37825d3e1.zip | |
Auto merge of #8599 - jdm:e10s-redux, r=metajack
compositing: Split Servo up into multiple sandboxed processes.
Multiprocess mode is enabled with the `-M` switch, and sandboxing is
enabled with the `-S` switch.
Rebase of #6884.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8599)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/bindings/trace.rs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index efb0952e3dc..e893f284978 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -53,7 +53,7 @@ use js::jsval::JSVal; use js::rust::Runtime; use layout_interface::{LayoutChan, LayoutRPC}; use libc; -use msg::constellation_msg::ConstellationChan; +use msg::constellation_msg::{ConstellationChan, ScriptMsg}; use msg::constellation_msg::{PipelineId, SubpageId, WindowSizeData, WorkerId}; use net_traits::Metadata; use net_traits::image::base::Image; @@ -275,7 +275,6 @@ no_jsmanaged_fields!(WorkerId); no_jsmanaged_fields!(QuirksMode); no_jsmanaged_fields!(Runtime); no_jsmanaged_fields!(Headers, Method); -no_jsmanaged_fields!(ConstellationChan<ConstellationMsg>); no_jsmanaged_fields!(LayoutChan); no_jsmanaged_fields!(WindowProxyHandler); no_jsmanaged_fields!(UntrustedNodeAddress); @@ -299,6 +298,13 @@ no_jsmanaged_fields!(AttrIdentifier); no_jsmanaged_fields!(AttrValue); no_jsmanaged_fields!(ElementSnapshot); +impl JSTraceable for ConstellationChan<ScriptMsg> { + #[inline] + fn trace(&self, _trc: *mut JSTracer) { + // Do nothing + } +} + impl JSTraceable for Box<ScriptChan + Send> { #[inline] fn trace(&self, _trc: *mut JSTracer) { |