diff options
author | Martin Robinson <mrobinson@igalia.com> | 2023-07-10 15:54:39 +0200 |
---|---|---|
committer | Martin Robinson <mrobinson@igalia.com> | 2023-07-10 17:35:50 +0200 |
commit | 3230162fd0ac96dea77c683b2067ae65ec7ed0b4 (patch) | |
tree | a514617f5d3b72eb5e00cf60b86d8478de9b0e02 /components/gfx/font.rs | |
parent | 1543912589e67734f0b684e1db900f41a4c04a1a (diff) | |
download | servo-3230162fd0ac96dea77c683b2067ae65ec7ed0b4.tar.gz servo-3230162fd0ac96dea77c683b2067ae65ec7ed0b4.zip |
Try to `use` WebRender types more
The newer versions of WebRender move types around between `webrender` and
`webrender_api` and this will reduce the churn during the upgrade.
Diffstat (limited to 'components/gfx/font.rs')
-rw-r--r-- | components/gfx/font.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/gfx/font.rs b/components/gfx/font.rs index 05ffb897a4e..7feb66fcaa3 100644 --- a/components/gfx/font.rs +++ b/components/gfx/font.rs @@ -27,6 +27,7 @@ use style::computed_values::{font_stretch, font_style, font_variant_caps, font_w use style::properties::style_structs::Font as FontStyleStruct; use style::values::computed::font::{GenericFontFamily, SingleFontFamily}; use unicode_script::Script; +use webrender_api::FontInstanceKey; macro_rules! ot_tag { ($t1:expr, $t2:expr, $t3:expr, $t4:expr) => { @@ -145,7 +146,7 @@ pub struct Font { shaper: Option<Shaper>, shape_cache: RefCell<HashMap<ShapeCacheEntry, Arc<GlyphStore>>>, glyph_advance_cache: RefCell<HashMap<u32, FractionalPixel>>, - pub font_key: webrender_api::FontInstanceKey, + pub font_key: FontInstanceKey, } impl Font { @@ -153,7 +154,7 @@ impl Font { handle: FontHandle, descriptor: FontDescriptor, actual_pt_size: Au, - font_key: webrender_api::FontInstanceKey, + font_key: FontInstanceKey, ) -> Font { let metrics = handle.metrics(); |