diff options
author | bors-servo <infra@servo.org> | 2023-05-11 21:04:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-11 21:04:45 +0200 |
commit | 9bec0d0f8e92e90b5d8c99ba691a9d9a6bb41bcc (patch) | |
tree | fbfaa73aa4702fdb2a32fe6838388189ab1d41db /components/layout | |
parent | feaa66b5972c3e31d77c2acce7d626c455320535 (diff) | |
parent | ab2ba273e342c6f1a0c1f29cca3f551fd8926e94 (diff) | |
download | servo-9bec0d0f8e92e90b5d8c99ba691a9d9a6bb41bcc.tar.gz servo-9bec0d0f8e92e90b5d8c99ba691a9d9a6bb41bcc.zip |
Auto merge of #29728 - Loirooriol:sync-fontprovider-D157589, r=mrobinson
Simplify our setup for font metric queries from style
This is a backport of https://phabricator.services.mozilla.com/D157589,
by Emilio Cobos Álvarez, plus some additions so that Servo compiles,
and some parts from https://phabricator.services.mozilla.com/D144455.
Should have no change in behavior.
<!-- 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
- [ ] These changes fix #___ (GitHub issue number if applicable)
<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because there should be no change in behavior
<!-- 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/layout')
-rw-r--r-- | components/layout/query.rs | 4 | ||||
-rw-r--r-- | components/layout/traversal.rs | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/components/layout/query.rs b/components/layout/query.rs index 1d4e810c23a..98a3ec662fb 100644 --- a/components/layout/query.rs +++ b/components/layout/query.rs @@ -856,7 +856,7 @@ where if element.has_data() { node.to_threadsafe().as_element().unwrap().resolved_style() } else { - let mut tlc = ThreadLocalStyleContext::new(&context.style_context); + let mut tlc = ThreadLocalStyleContext::new(); let mut context = StyleContext { shared: &context.style_context, thread_local: &mut tlc, @@ -911,7 +911,7 @@ pub fn process_resolved_style_request<'dom>( return String::new(); } - let mut tlc = ThreadLocalStyleContext::new(&context.style_context); + let mut tlc = ThreadLocalStyleContext::new(); let mut context = StyleContext { shared: &context.style_context, thread_local: &mut tlc, diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs index d07f76105e8..840aba5ef05 100644 --- a/components/layout/traversal.rs +++ b/components/layout/traversal.rs @@ -46,7 +46,6 @@ impl<'a, 'dom, E> DomTraversal<E> for RecalcStyleAndConstructFlows<'a> where E: TElement, E::ConcreteNode: LayoutNode<'dom>, - E::FontMetricsProvider: Send, { fn process_preorder<F>( &self, |