diff options
| -rw-r--r-- | components/style/properties/helpers.mako.rs | 4 | ||||
| -rw-r--r-- | components/style/properties/properties.mako.rs | 19 | ||||
| -rw-r--r-- | components/style/values/animated/effects.rs | 2 |
3 files changed, 6 insertions, 19 deletions
diff --git a/components/style/properties/helpers.mako.rs b/components/style/properties/helpers.mako.rs index ca9700737fe..800d50c6220 100644 --- a/components/style/properties/helpers.mako.rs +++ b/components/style/properties/helpers.mako.rs @@ -366,7 +366,7 @@ pub use self::single_value::SpecifiedValue as SingleSpecifiedValue; - % if not simple_vector_bindings: + % if not simple_vector_bindings and product == "gecko": impl SpecifiedValue { fn compute_iter<'a, 'cx, 'cx_a>( &'a self, @@ -496,7 +496,7 @@ .set_writing_mode_dependency(context.builder.writing_mode); % endif - % if property.is_vector and not property.simple_vector_bindings: + % if property.is_vector and not property.simple_vector_bindings and product == "gecko": // In the case of a vector property we want to pass down an // iterator so that this can be computed without allocation. // diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index ed71019b390..520b4a32b51 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -2482,20 +2482,7 @@ pub mod style_structs { % if longhand.logical: ${helpers.logical_setter(name=longhand.name)} % else: - % if longhand.is_vector: - /// Set ${longhand.name}. - #[allow(non_snake_case)] - #[inline] - pub fn set_${longhand.ident}<I>(&mut self, v: I) - where - I: IntoIterator<Item = longhands::${longhand.ident} - ::computed_value::single_value::T>, - I::IntoIter: ExactSizeIterator - { - self.${longhand.ident} = longhands::${longhand.ident}::computed_value - ::List(v.into_iter().collect()); - } - % elif longhand.ident == "display": + % if longhand.ident == "display": /// Set `display`. /// /// We need to keep track of the original display for hypothetical boxes, @@ -3109,7 +3096,7 @@ impl ComputedValuesInner { pub fn transform_requires_layer(&self) -> bool { use crate::values::generics::transform::TransformOperation; // Check if the transform matrix is 2D or 3D - for transform in &self.get_box().transform.0 { + for transform in &*self.get_box().transform.0 { match *transform { TransformOperation::Perspective(..) => { return true; @@ -3452,7 +3439,7 @@ impl<'a> StyleBuilder<'a> { } % endif - % if not property.is_vector or property.simple_vector_bindings: + % if not property.is_vector or property.simple_vector_bindings or product != "gecko": /// Set the `${property.ident}` to the computed value `value`. #[allow(non_snake_case)] pub fn set_${property.ident}( diff --git a/components/style/values/animated/effects.rs b/components/style/values/animated/effects.rs index 2f11e1b994d..4c559cd4c30 100644 --- a/components/style/values/animated/effects.rs +++ b/components/style/values/animated/effects.rs @@ -15,7 +15,7 @@ use crate::values::generics::effects::SimpleShadow as GenericSimpleShadow; use crate::values::Impossible; /// An animated value for the `drop-shadow()` filter. -type AnimatedSimpleShadow = GenericSimpleShadow<Color, Length, Length>; +pub type AnimatedSimpleShadow = GenericSimpleShadow<Color, Length, Length>; /// An animated value for a single `filter`. #[cfg(feature = "gecko")] |