From 239f2da9d93286208810f539b7b72c6a36ae0c23 Mon Sep 17 00:00:00 2001 From: Nicolas Silva Date: Thu, 18 Jul 2019 22:54:16 +0200 Subject: [PATCH] style: Update to euclid 0.20. Differential Revision: https://phabricator.services.mozilla.com/D38530 --- components/malloc_size_of/Cargo.toml | 2 +- components/malloc_size_of/lib.rs | 16 ++++++++-------- components/style/Cargo.toml | 2 +- components/style/context.rs | 6 +++--- components/style/gecko/media_features.rs | 2 +- components/style/gecko/media_queries.rs | 12 ++++++------ components/style/logical_geometry.rs | 2 +- components/style/servo/media_queries.rs | 12 ++++++------ components/style/stylesheets/viewport_rule.rs | 4 ++-- components/style/values/computed/mod.rs | 2 +- components/style/values/computed/transform.rs | 2 +- components/style/values/distance.rs | 2 +- components/style/values/generics/transform.rs | 5 +++-- components/style/values/specified/length.rs | 2 +- components/style_traits/Cargo.toml | 2 +- components/style_traits/viewport.rs | 4 ++-- 16 files changed, 39 insertions(+), 38 deletions(-) diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml index 271461ad9c5..3de67f45abb 100644 --- a/components/malloc_size_of/Cargo.toml +++ b/components/malloc_size_of/Cargo.toml @@ -27,7 +27,7 @@ servo = [ app_units = "0.7" crossbeam-channel = { version = "0.3", optional = true } cssparser = "0.25" -euclid = "0.19" +euclid = "0.20" hashglobe = { path = "../hashglobe" } hyper = { version = "0.12", optional = true } hyper_serde = { version = "0.11", optional = true } diff --git a/components/malloc_size_of/lib.rs b/components/malloc_size_of/lib.rs index 2be7f565a76..d7e0a6fdf16 100644 --- a/components/malloc_size_of/lib.rs +++ b/components/malloc_size_of/lib.rs @@ -625,25 +625,25 @@ impl MallocSizeOf for euclid::Length { } } -impl MallocSizeOf for euclid::TypedScale { +impl MallocSizeOf for euclid::Scale { fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { self.0.size_of(ops) } } -impl MallocSizeOf for euclid::TypedPoint2D { +impl MallocSizeOf for euclid::Point2D { fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { self.x.size_of(ops) + self.y.size_of(ops) } } -impl MallocSizeOf for euclid::TypedRect { +impl MallocSizeOf for euclid::Rect { fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { self.origin.size_of(ops) + self.size.size_of(ops) } } -impl MallocSizeOf for euclid::TypedSideOffsets2D { +impl MallocSizeOf for euclid::SideOffsets2D { fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { self.top.size_of(ops) + self.right.size_of(ops) + @@ -652,13 +652,13 @@ impl MallocSizeOf for euclid::TypedSideOffsets2D { } } -impl MallocSizeOf for euclid::TypedSize2D { +impl MallocSizeOf for euclid::Size2D { fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { self.width.size_of(ops) + self.height.size_of(ops) } } -impl MallocSizeOf for euclid::TypedTransform2D { +impl MallocSizeOf for euclid::Transform2D { fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { self.m11.size_of(ops) + self.m12.size_of(ops) + @@ -669,7 +669,7 @@ impl MallocSizeOf for euclid::TypedTransform2D MallocSizeOf for euclid::TypedTransform3D { +impl MallocSizeOf for euclid::Transform3D { fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { self.m11.size_of(ops) + self.m12.size_of(ops) + @@ -690,7 +690,7 @@ impl MallocSizeOf for euclid::TypedTransform3D MallocSizeOf for euclid::TypedVector2D { +impl MallocSizeOf for euclid::Vector2D { fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { self.x.size_of(ops) + self.y.size_of(ops) } diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 402e265514b..d276c5fbc6c 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -36,7 +36,7 @@ crossbeam-channel = { version = "0.3", optional = true } derive_more = "0.13" new_debug_unreachable = "1.0" encoding_rs = {version = "0.8", optional = true} -euclid = "0.19" +euclid = "0.20" fallible = { path = "../fallible" } fxhash = "0.2" hashglobe = { path = "../hashglobe" } diff --git a/components/style/context.rs b/components/style/context.rs index 6d93b973b22..0c7d9744117 100644 --- a/components/style/context.rs +++ b/components/style/context.rs @@ -31,8 +31,8 @@ use crate::traversal_flags::TraversalFlags; use app_units::Au; #[cfg(feature = "servo")] use crossbeam_channel::Sender; -use euclid::Size2D; -use euclid::TypedScale; +use euclid::default::Size2D; +use euclid::Scale; use fxhash::FxHashMap; #[cfg(feature = "servo")] use parking_lot::RwLock; @@ -195,7 +195,7 @@ impl<'a> SharedStyleContext<'a> { } /// The device pixel ratio - pub fn device_pixel_ratio(&self) -> TypedScale { + pub fn device_pixel_ratio(&self) -> Scale { self.stylist.device().device_pixel_ratio() } diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs index 4b94571c8ef..a80c486a6c3 100644 --- a/components/style/gecko/media_features.rs +++ b/components/style/gecko/media_features.rs @@ -14,7 +14,7 @@ use crate::values::computed::CSSPixelLength; use crate::values::computed::Resolution; use crate::Atom; use app_units::Au; -use euclid::Size2D; +use euclid::default::Size2D; fn viewport_size(device: &Device) -> Size2D { if let Some(pc) = device.pres_context() { diff --git a/components/style/gecko/media_queries.rs b/components/style/gecko/media_queries.rs index 459d58121ac..556470569db 100644 --- a/components/style/gecko/media_queries.rs +++ b/components/style/gecko/media_queries.rs @@ -16,8 +16,8 @@ use crate::values::{CustomIdent, KeyframesName}; use app_units::Au; use app_units::AU_PER_PX; use cssparser::RGBA; -use euclid::Size2D; -use euclid::TypedScale; +use euclid::default::Size2D; +use euclid::Scale; use servo_arc::Arc; use std::fmt; use std::sync::atomic::{AtomicBool, AtomicIsize, AtomicUsize, Ordering}; @@ -247,20 +247,20 @@ impl Device { } /// Returns the device pixel ratio. - pub fn device_pixel_ratio(&self) -> TypedScale { + pub fn device_pixel_ratio(&self) -> Scale { let pc = match self.pres_context() { Some(pc) => pc, - None => return TypedScale::new(1.), + None => return Scale::new(1.), }; let override_dppx = pc.mOverrideDPPX; if override_dppx > 0.0 { - return TypedScale::new(override_dppx); + return Scale::new(override_dppx); } let au_per_dpx = pc.mCurAppUnitsPerDevPixel as f32; let au_per_px = AU_PER_PX as f32; - TypedScale::new(au_per_px / au_per_dpx) + Scale::new(au_per_px / au_per_dpx) } /// Returns whether document colors are enabled. diff --git a/components/style/logical_geometry.rs b/components/style/logical_geometry.rs index dc6bae55461..90fbabe0a7f 100644 --- a/components/style/logical_geometry.rs +++ b/components/style/logical_geometry.rs @@ -6,7 +6,7 @@ use crate::properties::style_structs; use euclid::num::Zero; -use euclid::{Point2D, Rect, SideOffsets2D, Size2D}; +use euclid::default::{Point2D, Rect, Size2D, SideOffsets2D}; use std::cmp::{max, min}; use std::fmt::{self, Debug, Error, Formatter}; use std::ops::{Add, Sub}; diff --git a/components/style/servo/media_queries.rs b/components/style/servo/media_queries.rs index b3c99cf875a..b007823eeeb 100644 --- a/components/style/servo/media_queries.rs +++ b/components/style/servo/media_queries.rs @@ -15,7 +15,7 @@ use crate::values::computed::CSSPixelLength; use crate::values::KeyframesName; use app_units::Au; use cssparser::RGBA; -use euclid::{Size2D, TypedScale, TypedSize2D}; +use euclid::{Size2D, Scale, Size2D}; use std::sync::atomic::{AtomicBool, AtomicIsize, Ordering}; use style_traits::viewport::ViewportConstraints; use style_traits::{CSSPixel, DevicePixel}; @@ -29,9 +29,9 @@ pub struct Device { /// The current media type used by de device. media_type: MediaType, /// The current viewport size, in CSS pixels. - viewport_size: TypedSize2D, + viewport_size: Size2D, /// The current device pixel ratio, from CSS pixels to device pixels. - device_pixel_ratio: TypedScale, + device_pixel_ratio: Scale, /// The font size of the root element /// This is set when computing the style of the root @@ -59,8 +59,8 @@ impl Device { /// Trivially construct a new `Device`. pub fn new( media_type: MediaType, - viewport_size: TypedSize2D, - device_pixel_ratio: TypedScale, + viewport_size: Size2D, + device_pixel_ratio: Scale, ) -> Device { Device { media_type, @@ -140,7 +140,7 @@ impl Device { } /// Returns the device pixel ratio. - pub fn device_pixel_ratio(&self) -> TypedScale { + pub fn device_pixel_ratio(&self) -> Scale { self.device_pixel_ratio } diff --git a/components/style/stylesheets/viewport_rule.rs b/components/style/stylesheets/viewport_rule.rs index e845930bfbd..8cc858f7a7f 100644 --- a/components/style/stylesheets/viewport_rule.rs +++ b/components/style/stylesheets/viewport_rule.rs @@ -25,7 +25,7 @@ use crate::values::specified::{NonNegativeLengthPercentageOrAuto, ViewportPercen use app_units::Au; use cssparser::CowRcStr; use cssparser::{parse_important, AtRuleParser, DeclarationListParser, DeclarationParser, Parser}; -use euclid::TypedSize2D; +use euclid::Size2D; use selectors::parser::SelectorParseErrorKind; use std::borrow::Cow; use std::cell::RefCell; @@ -832,7 +832,7 @@ impl MaybeNew for ViewportConstraints { }); Some(ViewportConstraints { - size: TypedSize2D::new(width.to_f32_px(), height.to_f32_px()), + size: Size2D::new(width.to_f32_px(), height.to_f32_px()), // TODO: compute a zoom factor for 'auto' as suggested by DEVICE-ADAPT ยง 10. initial_zoom: PinchZoomFactor::new(initial_zoom.unwrap_or(1.)), diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs index aa37189f051..7cfe0de6d8d 100644 --- a/components/style/values/computed/mod.rs +++ b/components/style/values/computed/mod.rs @@ -23,7 +23,7 @@ use crate::rule_cache::RuleCacheConditions; use crate::Atom; #[cfg(feature = "servo")] use crate::Prefix; -use euclid::Size2D; +use euclid::default::Size2D; use std::cell::RefCell; use std::cmp; use std::f32; diff --git a/components/style/values/computed/transform.rs b/components/style/values/computed/transform.rs index 9104a43ae5b..46c471b7e2e 100644 --- a/components/style/values/computed/transform.rs +++ b/components/style/values/computed/transform.rs @@ -10,7 +10,7 @@ use crate::values::animated::ToAnimatedZero; use crate::values::computed::{Angle, Integer, Length, LengthPercentage, Number, Percentage}; use crate::values::generics::transform as generic; use crate::Zero; -use euclid::{Transform3D, Vector3D}; +use euclid::default::{Transform3D, Vector3D}; pub use crate::values::generics::transform::TransformStyle; diff --git a/components/style/values/distance.rs b/components/style/values/distance.rs index d3b4c7dfaad..a1872366c2a 100644 --- a/components/style/values/distance.rs +++ b/components/style/values/distance.rs @@ -5,7 +5,7 @@ //! Machinery to compute distances between animatable values. use app_units::Au; -use euclid::Size2D; +use euclid::default::Size2D; use std::iter::Sum; use std::ops::Add; diff --git a/components/style/values/generics/transform.rs b/components/style/values/generics/transform.rs index f6fd800247a..d8e9b27f5f0 100644 --- a/components/style/values/generics/transform.rs +++ b/components/style/values/generics/transform.rs @@ -12,7 +12,8 @@ use crate::values::specified::length::LengthPercentage as SpecifiedLengthPercent use crate::values::{computed, CSSFloat}; use crate::Zero; use app_units::Au; -use euclid::{self, Rect, Transform3D}; +use euclid::default::{Rect, Transform3D}; +use euclid; use std::fmt::{self, Write}; use style_traits::{CssWriter, ToCss}; @@ -562,7 +563,7 @@ impl Transform { for operation in &*self.0 { let matrix = operation.to_3d_matrix(reference_box)?; contain_3d |= operation.is_3d(); - transform = transform.pre_mul(&matrix); + transform = transform.pre_transform(&matrix); } Ok((transform, contain_3d)) diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs index 5bb01955956..6ae374685b8 100644 --- a/components/style/values/specified/length.rs +++ b/components/style/values/specified/length.rs @@ -22,7 +22,7 @@ use crate::values::CSSFloat; use crate::Zero; use app_units::Au; use cssparser::{Parser, Token}; -use euclid::Size2D; +use euclid::default::Size2D; use std::cmp; use std::ops::{Add, Mul}; use style_traits::values::specified::AllowedNumericType; diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml index acf46422861..fbd804737a5 100644 --- a/components/style_traits/Cargo.toml +++ b/components/style_traits/Cargo.toml @@ -17,7 +17,7 @@ gecko = [] app_units = "0.7" cssparser = "0.25" bitflags = "1.0" -euclid = "0.19" +euclid = "0.20" lazy_static = "1" malloc_size_of = { path = "../malloc_size_of" } malloc_size_of_derive = "0.1" diff --git a/components/style_traits/viewport.rs b/components/style_traits/viewport.rs index fb10345c1b2..eff1dfca7ad 100644 --- a/components/style_traits/viewport.rs +++ b/components/style_traits/viewport.rs @@ -6,7 +6,7 @@ use crate::{CSSPixel, CssWriter, ParseError, PinchZoomFactor, ToCss}; use cssparser::Parser; -use euclid::TypedSize2D; +use euclid::Size2D; use std::fmt::{self, Write}; define_css_keyword_enum! { @@ -33,7 +33,7 @@ pub struct ViewportConstraints { /// Width and height: /// * https://drafts.csswg.org/css-device-adapt/#width-desc /// * https://drafts.csswg.org/css-device-adapt/#height-desc - pub size: TypedSize2D, + pub size: Size2D, /// pub initial_zoom: PinchZoomFactor, ///