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/style/servo/media_queries.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/style/servo/media_queries.rs')
-rw-r--r-- | components/style/servo/media_queries.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/components/style/servo/media_queries.rs b/components/style/servo/media_queries.rs index b007823eeeb..df7bf93b8ac 100644 --- a/components/style/servo/media_queries.rs +++ b/components/style/servo/media_queries.rs @@ -15,7 +15,8 @@ use crate::values::computed::CSSPixelLength; use crate::values::KeyframesName; use app_units::Au; use cssparser::RGBA; -use euclid::{Size2D, Scale, Size2D}; +use euclid::default::Size2D as UntypedSize2D; +use euclid::{Scale, Size2D}; use std::sync::atomic::{AtomicBool, AtomicIsize, Ordering}; use style_traits::viewport::ViewportConstraints; use style_traits::{CSSPixel, DevicePixel}; @@ -121,7 +122,7 @@ impl Device { /// Returns the viewport size of the current device in app units, needed, /// among other things, to resolve viewport units. #[inline] - pub fn au_viewport_size(&self) -> Size2D<Au> { + pub fn au_viewport_size(&self) -> UntypedSize2D<Au> { Size2D::new( Au::from_f32_px(self.viewport_size.width), Au::from_f32_px(self.viewport_size.height), @@ -129,7 +130,7 @@ impl Device { } /// Like the above, but records that we've used viewport units. - pub fn au_viewport_size_for_viewport_unit_resolution(&self) -> Size2D<Au> { + pub fn au_viewport_size_for_viewport_unit_resolution(&self) -> UntypedSize2D<Au> { self.used_viewport_units.store(true, Ordering::Relaxed); self.au_viewport_size() } |