From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:34:50 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- gfx/wr/wr_glyph_rasterizer/Cargo.toml | 2 +- gfx/wr/wr_glyph_rasterizer/src/platform/macos/font.rs | 1 - gfx/wr/wr_glyph_rasterizer/src/platform/windows/font.rs | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) (limited to 'gfx/wr/wr_glyph_rasterizer') diff --git a/gfx/wr/wr_glyph_rasterizer/Cargo.toml b/gfx/wr/wr_glyph_rasterizer/Cargo.toml index b06cd0f084..93877277b5 100644 --- a/gfx/wr/wr_glyph_rasterizer/Cargo.toml +++ b/gfx/wr/wr_glyph_rasterizer/Cargo.toml @@ -25,7 +25,7 @@ tracy-rs = "0.1.2" log = "0.4" lazy_static = "1" fxhash = "0.2.1" -glean = { version = "58.1.0", optional = true } +glean = { version = "59.0.0", optional = true } firefox-on-glean = { version = "0.1.0", optional = true } serde = { optional = true, version = "1.0", features = ["serde_derive"] } diff --git a/gfx/wr/wr_glyph_rasterizer/src/platform/macos/font.rs b/gfx/wr/wr_glyph_rasterizer/src/platform/macos/font.rs index aa4e301d32..bdbdee96a1 100644 --- a/gfx/wr/wr_glyph_rasterizer/src/platform/macos/font.rs +++ b/gfx/wr/wr_glyph_rasterizer/src/platform/macos/font.rs @@ -18,7 +18,6 @@ use core_graphics::context::{CGBlendMode, CGTextDrawingMode}; use core_graphics::font::{CGFont, CGGlyph}; use core_graphics::geometry::{CGAffineTransform, CGPoint, CGSize}; use core_graphics::geometry::{CG_AFFINE_TRANSFORM_IDENTITY, CGRect}; -use core_text; use core_text::font::CTFont; use core_text::font_descriptor::{CTFontDescriptor, kCTFontDefaultOrientation}; use core_text::font_descriptor::{kCTFontURLAttribute, kCTFontVariationAttribute}; diff --git a/gfx/wr/wr_glyph_rasterizer/src/platform/windows/font.rs b/gfx/wr/wr_glyph_rasterizer/src/platform/windows/font.rs index 81232d70c4..20fccc626a 100644 --- a/gfx/wr/wr_glyph_rasterizer/src/platform/windows/font.rs +++ b/gfx/wr/wr_glyph_rasterizer/src/platform/windows/font.rs @@ -4,7 +4,6 @@ use api::{FontInstanceFlags, FontKey, FontRenderMode, FontVariation}; use api::{ColorU, GlyphDimensions, NativeFontHandle}; -use dwrote; use crate::gamma_lut::{ColorLut, GammaLut}; use crate::rasterizer::{FontInstance, FontTransform, GlyphKey}; use crate::rasterizer::{GlyphFormat, GlyphRasterError, GlyphRasterResult, RasterizedGlyph}; -- cgit v1.2.3