servo: Merge #12560 - Hoist retrieval of layout_threads from opts into Constellation (from djc:layout-threads-hoist); r=emilio

<!-- Please describe your changes on the following line: -->

This makes the lower-level crates less dependent on `util::opts`.

---
<!-- 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
- [ ] 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 only

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 2d0178863de61f3cbe3ab24e193dff783dcfc9a3
This commit is contained in:
Dirkjan Ochtman
2016-07-24 14:53:34 -05:00
parent 5883d7ddaa
commit 262003de31
6 changed files with 26 additions and 10 deletions

View File

@@ -1142,6 +1142,7 @@ impl ScriptThread {
pipeline_port,
layout_to_constellation_chan,
content_process_shutdown_chan,
layout_threads,
} = new_layout_info;
let layout_pair = channel();
@@ -1158,6 +1159,7 @@ impl ScriptThread {
script_chan: self.control_chan.clone(),
image_cache_thread: self.image_cache_thread.clone(),
content_process_shutdown_chan: content_process_shutdown_chan,
layout_threads: layout_threads,
};
let context = self.root_browsing_context();