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.

1 files changed, 0 insertions, 3 deletions

diff --git a/components/script/layout_dom/element.rs b/components/script/layout_dom/element.rs
index 9b9f8c4790b..adbeba7e39d 100644
--- a/components/script/layout_dom/element.rs
+++ b/components/script/layout_dom/element.rs
@@ -33,7 +33,6 @@ use style::context::SharedStyleContext;
 use style::data::ElementData;
 use style::dom::{DomChildren, LayoutIterator, TDocument, TElement, TNode, TShadowRoot};
 use style::element_state::*;
-use style::font_metrics::ServoMetricsProvider;
 use style::properties::PropertyDeclarationBlock;
 use style::selector_parser::{
     extended_filtering, AttrValue as SelectorAttrValue, Lang, NonTSPseudoClass, PseudoElement,
@@ -169,8 +168,6 @@ impl<'dom, LayoutDataType: LayoutDataTrait> style::dom::TElement
     type ConcreteNode = ServoLayoutNode<'dom, LayoutDataType>;
     type TraversalChildrenIterator = DomChildren<Self::ConcreteNode>;
 
-    type FontMetricsProvider = ServoMetricsProvider;
-
     fn as_node(&self) -> ServoLayoutNode<'dom, LayoutDataType> {
         ServoLayoutNode::from_layout_js(self.element.upcast())
     }