diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-07-31 09:43:40 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-07-31 09:43:40 -0600 |
| commit | c4480b5d0309acc7f154166b91992f73a85de57f (patch) | |
| tree | 494001ef3527c23854439ddca953a7443025712c /components/layout_traits/lib.rs | |
| parent | 33bc16fe353be237855d006b34e96fbe59f24846 (diff) | |
| parent | 17ead8716b53715086c990dc16e20e1cf6462c16 (diff) | |
| download | servo-c4480b5d0309acc7f154166b91992f73a85de57f.tar.gz servo-c4480b5d0309acc7f154166b91992f73a85de57f.zip | |
Auto merge of #6795 - pcwalton:display-list-e10s-fixes, r=glennw
Send display lists over IPC in multiprocess mode.
This patch set introduces the `--multiprocess` (`-M`) switch. Right now, all it does it cause display lists to be serialized, but eventually it will cause actual processes to be spawned.
r? @metajack
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6795)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout_traits/lib.rs')
| -rw-r--r-- | components/layout_traits/lib.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/layout_traits/lib.rs b/components/layout_traits/lib.rs index 361ba3c2654..d75817911a7 100644 --- a/components/layout_traits/lib.rs +++ b/components/layout_traits/lib.rs @@ -22,7 +22,7 @@ extern crate util; // that these modules won't have to depend on layout. use gfx::font_cache_task::FontCacheTask; -use gfx::paint_task::PaintChan; +use gfx::paint_task::LayoutToPaintMsg; use ipc_channel::ipc::{IpcReceiver, IpcSender}; use msg::constellation_msg::{ConstellationChan, Failure, PipelineId}; use profile_traits::mem; @@ -31,6 +31,7 @@ use net_traits::image_cache_task::ImageCacheTask; use script_traits::{LayoutControlMsg, ScriptControlChan, OpaqueScriptLayoutChannel}; use std::sync::mpsc::Sender; use url::Url; +use util::ipc::OptionalIpcSender; /// A channel wrapper for constellation messages #[derive(Clone, Deserialize, Serialize)] @@ -49,7 +50,7 @@ pub trait LayoutTaskFactory { constellation_chan: ConstellationChan, failure_msg: Failure, script_chan: ScriptControlChan, - paint_chan: PaintChan, + layout_to_paint_chan: OptionalIpcSender<LayoutToPaintMsg>, image_cache_task: ImageCacheTask, font_cache_task: FontCacheTask, time_profiler_chan: time::ProfilerChan, |