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

1 files changed, 0 insertions, 3 deletions

diff --git a/components/script_layout_interface/wrapper_traits.rs b/components/script_layout_interface/wrapper_traits.rs
index 9091a394161..8ba009a7a47 100644
--- a/components/script_layout_interface/wrapper_traits.rs
+++ b/components/script_layout_interface/wrapper_traits.rs
@@ -25,7 +25,6 @@ use style::context::SharedStyleContext;
 use style::data::ElementData;
 use style::dom::OpaqueNode;
 use style::dom::{LayoutIterator, NodeInfo, TElement, TNode};
-use style::font_metrics::ServoMetricsProvider;
 use style::properties::ComputedValues;
 use style::selector_parser::{PseudoElement, PseudoElementCascadeType, SelectorImpl};
 use style::stylist::RuleInclusion;
@@ -439,7 +438,6 @@ pub trait ThreadSafeLayoutElement<'dom>:
                             &context.guards,
                             &style_pseudo,
                             Some(data.styles.primary()),
-                            &ServoMetricsProvider,
                         ),
                     PseudoElementCascadeType::Lazy => {
                         context
@@ -451,7 +449,6 @@ pub trait ThreadSafeLayoutElement<'dom>:
                                 RuleInclusion::All,
                                 data.styles.primary(),
                                 /* is_probe = */ false,
-                                &ServoMetricsProvider,
                                 /* matching_func = */ None,
                             )
                             .unwrap()