diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-04-22 10:52:49 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-22 10:52:49 -0400 |
commit | 4e12deb7b6b61e2e329e8eaee431eddb473d1252 (patch) | |
tree | e81ca857db00b9266a4202b9a72977996049f057 /components/constellation | |
parent | 328244684a8b1f98d515d5f40655b9cf7347affd (diff) | |
parent | 4fd9fea7a64420265dfe482b577ad0fc74d2a817 (diff) | |
download | servo-4e12deb7b6b61e2e329e8eaee431eddb473d1252.tar.gz servo-4e12deb7b6b61e2e329e8eaee431eddb473d1252.zip |
Auto merge of #23115 - pylbrecht:measure.blocked.layout.queries, r=jdm
measure blocked layout queries
<!-- 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 #19797
<!-- Either: -->
- [ ] There are tests for these changes
<!-- 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. -->
<!-- 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/23115)
<!-- Reviewable:end -->
Diffstat (limited to 'components/constellation')
-rw-r--r-- | components/constellation/pipeline.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs index 2e8649b46bb..2113a275e21 100644 --- a/components/constellation/pipeline.rs +++ b/components/constellation/pipeline.rs @@ -40,6 +40,7 @@ use std::env; use std::ffi::OsStr; use std::process; use std::rc::Rc; +use std::sync::atomic::AtomicBool; use std::sync::Arc; use style_traits::CSSPixel; use style_traits::DevicePixel; @@ -528,6 +529,7 @@ impl UnprivilegedPipelineContent { self.script_chan.clone(), self.load_data.url.clone(), ); + let layout_thread_busy_flag = Arc::new(AtomicBool::new(false)); let layout_pair = STF::create( InitialScriptState { id: self.id, @@ -554,6 +556,7 @@ impl UnprivilegedPipelineContent { webvr_chan: self.webvr_chan, webrender_document: self.webrender_document, webrender_api_sender: self.webrender_api_sender.clone(), + layout_is_busy: layout_thread_busy_flag.clone(), }, self.load_data.clone(), ); @@ -576,6 +579,7 @@ impl UnprivilegedPipelineContent { self.webrender_api_sender, self.webrender_document, paint_time_metrics, + layout_thread_busy_flag.clone(), ); if wait_for_completion { |