Auto merge of #12560 - djc:layout-threads-hoist, r=emilio

Hoist retrieval of layout_threads from opts into Constellation

<!-- 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. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12560)
<!-- Reviewable:end -->

1 files changed, 2 insertions, 0 deletions

diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index cf0cebf5a65..1ec367e9b75 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -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();