From ab2ba273e342c6f1a0c1f29cca3f551fd8926e94 Mon Sep 17 00:00:00 2001 From: Oriol Brufau Date: Wed, 10 May 2023 03:34:29 +0200 Subject: Simplify our setup for font metric queries from style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- components/script_layout_interface/wrapper_traits.rs | 3 --- 1 file changed, 3 deletions(-) (limited to 'components/script_layout_interface/wrapper_traits.rs') 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() -- cgit v1.2.3