diff options
author | Emilio Cobos Álvarez <emilio@crisal.io> | 2019-07-22 12:49:39 +0200 |
---|---|---|
committer | Emilio Cobos Álvarez <emilio@crisal.io> | 2019-07-23 23:09:55 +0200 |
commit | 3d57c22e9cda982923dd184152d3f187910d7b46 (patch) | |
tree | 51d07653ebd19e68626a5a0b442e8dde98c9dbd0 /components/script/dom/screen.rs | |
parent | 2ff7cb5a3749d65bb7b7a8f637d8196e316179c9 (diff) | |
download | servo-3d57c22e9cda982923dd184152d3f187910d7b46.tar.gz servo-3d57c22e9cda982923dd184152d3f187910d7b46.zip |
Update euclid.
There are a few canvas2d-related dependencies that haven't updated, but they
only use euclid internally so that's not blocking landing the rest of the
changes.
Given the size of this patch, I think it's useful to get this landed as-is.
Diffstat (limited to 'components/script/dom/screen.rs')
-rw-r--r-- | components/script/dom/screen.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/screen.rs b/components/script/dom/screen.rs index ff90224d53a..cf5d6785405 100644 --- a/components/script/dom/screen.rs +++ b/components/script/dom/screen.rs @@ -12,7 +12,7 @@ use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::globalscope::GlobalScope; use crate::dom::window::Window; use dom_struct::dom_struct; -use euclid::TypedSize2D; +use euclid::Size2D; use profile_traits::ipc; use script_traits::ScriptMsg; use style_traits::CSSPixel; @@ -40,7 +40,7 @@ impl Screen { ) } - fn screen_size(&self) -> TypedSize2D<u32, CSSPixel> { + fn screen_size(&self) -> Size2D<u32, CSSPixel> { let (send, recv) = ipc::channel::<DeviceIntSize>(self.global().time_profiler_chan().clone()).unwrap(); self.window @@ -49,11 +49,11 @@ impl Screen { .send(ScriptMsg::GetScreenSize(send)) .unwrap(); let dpr = self.window.device_pixel_ratio(); - let screen = recv.recv().unwrap_or(TypedSize2D::zero()); + let screen = recv.recv().unwrap_or(Size2D::zero()); (screen.to_f32() / dpr).to_u32() } - fn screen_avail_size(&self) -> TypedSize2D<u32, CSSPixel> { + fn screen_avail_size(&self) -> Size2D<u32, CSSPixel> { let (send, recv) = ipc::channel::<DeviceIntSize>(self.global().time_profiler_chan().clone()).unwrap(); self.window @@ -62,7 +62,7 @@ impl Screen { .send(ScriptMsg::GetScreenAvailSize(send)) .unwrap(); let dpr = self.window.device_pixel_ratio(); - let screen = recv.recv().unwrap_or(TypedSize2D::zero()); + let screen = recv.recv().unwrap_or(Size2D::zero()); (screen.to_f32() / dpr).to_u32() } } |