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/script | |
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/script')
-rw-r--r-- | components/script/layout_dom/element.rs | 3 |
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()) } |