Make text-shadow and box-shadow use SimpleShadow

components/style/values/animated/effects.rs

@@ -4,18 +4,32 @@
 
 //! Animated types for CSS values related to effects.
 
+use app_units::Au;
 use properties::animated_properties::{Animatable, IntermediateColor};
+use properties::longhands::box_shadow::computed_value::T as ComputedBoxShadowList;
 use properties::longhands::filter::computed_value::T as ComputedFilterList;
+use properties::longhands::text_shadow::computed_value::T as ComputedTextShadowList;
+use std::cmp;
 #[cfg(not(feature = "gecko"))]
 use values::Impossible;
 use values::computed::{Angle, Number};
+use values::computed::effects::BoxShadow as ComputedBoxShadow;
 #[cfg(feature = "gecko")]
 use values::computed::effects::Filter as ComputedFilter;
 use values::computed::effects::SimpleShadow as ComputedSimpleShadow;
 use values::computed::length::Length;
+use values::generics::effects::BoxShadow as GenericBoxShadow;
 use values::generics::effects::Filter as GenericFilter;
 use values::generics::effects::SimpleShadow as GenericSimpleShadow;
 
+#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
+#[derive(Clone, Debug, PartialEq)]
+/// An animated value for the `box-shadow` property.
+pub struct BoxShadowList(pub Vec<BoxShadow>);
+
+/// An animated value for a single `box-shadow`.
+pub type BoxShadow = GenericBoxShadow<IntermediateColor, Length, Length>;
+
 /// An animated value for the `filter` property.
 #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
 #[derive(Clone, Debug, PartialEq)]
@@ -29,9 +43,190 @@ pub type Filter = GenericFilter<Angle, Number, Length, SimpleShadow>;
 #[cfg(not(feature = "gecko"))]
 pub type Filter = GenericFilter<Angle, Number, Length, Impossible>;
 
+#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
+#[derive(Clone, Debug, PartialEq)]
+/// An animated value for the `box-shadow` property.
+pub struct TextShadowList(pub Vec<SimpleShadow>);
+
 /// An animated value for the `drop-shadow()` filter.
 pub type SimpleShadow = GenericSimpleShadow<IntermediateColor, Length, Length>;
 
+impl From<BoxShadowList> for ComputedBoxShadowList {
+    fn from(list: BoxShadowList) -> Self {
+        ComputedBoxShadowList(list.0.into_iter().map(|s| s.into()).collect())
+    }
+}
+
+impl From<ComputedBoxShadowList> for BoxShadowList {
+    fn from(list: ComputedBoxShadowList) -> Self {
+        BoxShadowList(list.0.into_iter().map(|s| s.into()).collect())
+    }
+}
+
+/// https://drafts.csswg.org/css-transitions/#animtype-shadow-list
+impl Animatable for BoxShadowList {
+    #[inline]
+    fn add_weighted(
+        &self,
+        other: &Self,
+        self_portion: f64,
+        other_portion: f64,
+    ) -> Result<Self, ()> {
+        // The inset value must change
+        let mut zero = BoxShadow {
+            base: SimpleShadow {
+                color: IntermediateColor::transparent(),
+                horizontal: Au(0),
+                vertical: Au(0),
+                blur: Au(0),
+            },
+            spread: Au(0),
+            inset: false,
+        };
+
+        let max_len = cmp::max(self.0.len(), other.0.len());
+        let mut shadows = Vec::with_capacity(max_len);
+        for i in 0..max_len {
+            shadows.push(match (self.0.get(i), other.0.get(i)) {
+                (Some(shadow), Some(other)) => {
+                    shadow.add_weighted(other, self_portion, other_portion)?
+                },
+                (Some(shadow), None) => {
+                    zero.inset = shadow.inset;
+                    shadow.add_weighted(&zero, self_portion, other_portion)?
+                },
+                (None, Some(shadow)) => {
+                    zero.inset = shadow.inset;
+                    zero.add_weighted(&shadow, self_portion, other_portion)?
+                },
+                (None, None) => unreachable!(),
+            });
+        }
+
+        Ok(BoxShadowList(shadows))
+    }
+
+    #[inline]
+    fn add(&self, other: &Self) -> Result<Self, ()> {
+        Ok(BoxShadowList(
+            self.0.iter().cloned().chain(other.0.iter().cloned()).collect(),
+        ))
+    }
+}
+
+impl From<TextShadowList> for ComputedTextShadowList {
+    fn from(list: TextShadowList) -> Self {
+        ComputedTextShadowList(list.0.into_iter().map(|s| s.into()).collect())
+    }
+}
+
+impl From<ComputedTextShadowList> for TextShadowList {
+    fn from(list: ComputedTextShadowList) -> Self {
+        TextShadowList(list.0.into_iter().map(|s| s.into()).collect())
+    }
+}
+
+/// https://drafts.csswg.org/css-transitions/#animtype-shadow-list
+impl Animatable for TextShadowList {
+    #[inline]
+    fn add_weighted(
+        &self,
+        other: &Self,
+        self_portion: f64,
+        other_portion: f64,
+    ) -> Result<Self, ()> {
+        let zero = SimpleShadow {
+            color: IntermediateColor::transparent(),
+            horizontal: Au(0),
+            vertical: Au(0),
+            blur: Au(0),
+        };
+
+        let max_len = cmp::max(self.0.len(), other.0.len());
+        let mut shadows = Vec::with_capacity(max_len);
+        for i in 0..max_len {
+            shadows.push(match (self.0.get(i), other.0.get(i)) {
+                (Some(shadow), Some(other)) => {
+                    shadow.add_weighted(other, self_portion, other_portion)?
+                },
+                (Some(shadow), None) => {
+                    shadow.add_weighted(&zero, self_portion, other_portion)?
+                },
+                (None, Some(shadow)) => {
+                    zero.add_weighted(&shadow, self_portion, other_portion)?
+                },
+                (None, None) => unreachable!(),
+            });
+        }
+
+        Ok(TextShadowList(shadows))
+    }
+
+    #[inline]
+    fn add(&self, other: &Self) -> Result<Self, ()> {
+        Ok(TextShadowList(
+            self.0.iter().cloned().chain(other.0.iter().cloned()).collect(),
+        ))
+    }
+}
+
+impl From<ComputedBoxShadow> for BoxShadow {
+    #[inline]
+    fn from(shadow: ComputedBoxShadow) -> Self {
+        BoxShadow {
+            base: shadow.base.into(),
+            spread: shadow.spread,
+            inset: shadow.inset,
+        }
+    }
+}
+
+impl From<BoxShadow> for ComputedBoxShadow {
+    #[inline]
+    fn from(shadow: BoxShadow) -> Self {
+        ComputedBoxShadow {
+            base: shadow.base.into(),
+            spread: shadow.spread,
+            inset: shadow.inset,
+        }
+    }
+}
+
+impl Animatable for BoxShadow {
+    #[inline]
+    fn add_weighted(
+        &self,
+        other: &Self,
+        self_portion: f64,
+        other_portion: f64,
+    ) -> Result<Self, ()> {
+        if self.inset != other.inset {
+            return Err(());
+        }
+        Ok(BoxShadow {
+            base: self.base.add_weighted(&other.base, self_portion, other_portion)?,
+            spread: self.spread.add_weighted(&other.spread, self_portion, other_portion)?,
+            inset: self.inset,
+        })
+    }
+
+    #[inline]
+    fn compute_distance(&self, other: &Self) -> Result<f64, ()> {
+        self.compute_squared_distance(other).map(|sd| sd.sqrt())
+    }
+
+    #[inline]
+    fn compute_squared_distance(&self, other: &Self) -> Result<f64, ()> {
+        if self.inset != other.inset {
+            return Err(());
+        }
+        Ok(
+            self.base.compute_squared_distance(&other.base)? +
+            self.spread.compute_squared_distance(&other.spread)?,
+        )
+    }
+}
+
 impl From<ComputedFilterList> for FilterList {
     #[cfg(not(feature = "gecko"))]
     #[inline]
@@ -77,7 +272,6 @@ impl From<ComputedFilter> for Filter {
             GenericFilter::DropShadow(shadow) => {
                 GenericFilter::DropShadow(shadow.into())
             },
-            #[cfg(feature = "gecko")]
             GenericFilter::Url(url) => GenericFilter::Url(url),
         }
     }
@@ -100,7 +294,6 @@ impl From<Filter> for ComputedFilter {
             GenericFilter::DropShadow(shadow) => {
                 GenericFilter::DropShadow(shadow.into())
             },
-            #[cfg(feature = "gecko")]
             GenericFilter::Url(url) => GenericFilter::Url(url.clone())
         }
     }