diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/compositing/Cargo.toml | 1 | ||||
| -rw-r--r-- | components/compositing/compositor_thread.rs | 2 | ||||
| -rw-r--r-- | components/gfx/font_cache_thread.rs | 11 | ||||
| -rw-r--r-- | components/gfx_traits/Cargo.toml | 1 | ||||
| -rw-r--r-- | components/gfx_traits/lib.rs | 2 | ||||
| -rw-r--r-- | components/servo/Cargo.toml | 1 | ||||
| -rw-r--r-- | components/servo/lib.rs | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index 97419f37752..027d16233bf 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -16,7 +16,6 @@ default = [] gl = ["gleam", "pixels"] [dependencies] -app_units = "0.7" canvas = { path = "../canvas" } crossbeam-channel = "0.4" embedder_traits = { path = "../embedder_traits" } diff --git a/components/compositing/compositor_thread.rs b/components/compositing/compositor_thread.rs index 01fb92a544e..d74851d4413 100644 --- a/components/compositing/compositor_thread.rs +++ b/components/compositing/compositor_thread.rs @@ -129,7 +129,7 @@ pub enum Msg { pub enum WebrenderFontMsg { AddFontInstance( webrender_api::FontKey, - app_units::Au, + f32, Sender<webrender_api::FontInstanceKey>, ), AddFont(gfx_traits::FontData, Sender<webrender_api::FontKey>), diff --git a/components/gfx/font_cache_thread.rs b/components/gfx/font_cache_thread.rs index 45eead2357d..21771b151da 100644 --- a/components/gfx/font_cache_thread.rs +++ b/components/gfx/font_cache_thread.rs @@ -182,10 +182,13 @@ impl FontCache { Command::GetFontInstance(font_key, size, result) => { let webrender_api = &self.webrender_api; - let instance_key = *self - .font_instances - .entry((font_key, size)) - .or_insert_with(|| webrender_api.add_font_instance(font_key, size)); + let instance_key = + *self + .font_instances + .entry((font_key, size)) + .or_insert_with(|| { + webrender_api.add_font_instance(font_key, size.to_f32_px()) + }); let _ = result.send(instance_key); }, diff --git a/components/gfx_traits/Cargo.toml b/components/gfx_traits/Cargo.toml index 5d7acdd1b61..f4b7ef68931 100644 --- a/components/gfx_traits/Cargo.toml +++ b/components/gfx_traits/Cargo.toml @@ -11,7 +11,6 @@ name = "gfx_traits" path = "lib.rs" [dependencies] -app_units = "0.7" malloc_size_of = { path = "../malloc_size_of" } malloc_size_of_derive = "0.1" range = { path = "../range" } diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs index 447be6e5dc2..a7d447dfded 100644 --- a/components/gfx_traits/lib.rs +++ b/components/gfx_traits/lib.rs @@ -113,7 +113,7 @@ pub trait WebrenderApi { fn add_font_instance( &self, font_key: webrender_api::FontKey, - size: app_units::Au, + size: f32, ) -> webrender_api::FontInstanceKey; fn add_font(&self, data: FontData) -> webrender_api::FontKey; } diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 96b2ad36f68..2b52339e628 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -38,7 +38,6 @@ webrender_debugger = ["webrender/debugger"] xr-profile = ["canvas/xr-profile", "canvas_traits/xr-profile", "script/xr-profile", "webxr/profile"] [dependencies] -app_units = "0.7" background_hang_monitor = { path = "../background_hang_monitor" } bluetooth = { path = "../bluetooth" } bluetooth_traits = { path = "../bluetooth_traits" } diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 6dda30ed6ea..390bd2c6ea0 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -928,7 +928,7 @@ impl gfx_traits::WebrenderApi for FontCacheWR { fn add_font_instance( &self, font_key: webrender_api::FontKey, - size: app_units::Au, + size: f32, ) -> webrender_api::FontInstanceKey { let (sender, receiver) = unbounded(); let _ = self.0.send(Msg::Webrender(WebrenderMsg::Font( |