aboutsummaryrefslogtreecommitdiffstats
path: root/components/servo
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2020-02-06 13:27:29 -0500
committerGitHub <noreply@github.com>2020-02-06 13:27:29 -0500
commitc67b3d71e23f10ba2049bdd9aed822b19ed8527f (patch)
tree12ea008cfd24d348b3c6a1a0bb857b78f1826f28 /components/servo
parent5ef30c67334739c52fd3e82c21ff39e058a16fe5 (diff)
parenta4ba33376a86775c4bef43fec8f8301a6a3fa113 (diff)
downloadservo-c67b3d71e23f10ba2049bdd9aed822b19ed8527f.tar.gz
servo-c67b3d71e23f10ba2049bdd9aed822b19ed8527f.zip
Auto merge of #25694 - kunalmohan:24891-Constellation, r=Manishearth
Remove dependency of constellation on canvas move `ConstellationCanvasMsg` to canvas_traits and start canvas paint thread to components/servo. This, however, does not remove dependency for conditional compilation options. https://github.com/servo/servo/blob/5f55cd5d71df9c555fbc24777168396ddd539f28/components/constellation/Cargo.toml#L13-L15 <!-- Please describe your changes on the following line: --> --- <!-- 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` does not report any errors - [X] These changes fix #24891 (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/servo')
-rw-r--r--components/servo/lib.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 708c1036a8b..64fce28ff2f 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -892,6 +892,9 @@ fn create_constellation(
player_context,
event_loop_waker,
};
+
+ let (canvas_chan, ipc_canvas_chan) = canvas::canvas_paint_thread::CanvasPaintThread::start();
+
let (constellation_chan, from_swmanager_sender) = Constellation::<
script_layout_interface::message::Msg,
layout_thread::LayoutThread,
@@ -904,6 +907,8 @@ fn create_constellation(
opts.is_running_problem_test,
opts.hard_fail,
opts.enable_canvas_antialiasing,
+ canvas_chan,
+ ipc_canvas_chan,
);
if let Some(webvr_constellation_sender) = webvr_constellation_sender {