servo: Merge #17970 - Preserve unit in specified time value (from upsuper:time-unit); r=emilio

This fixes #15346.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7b299caf9b547412390512ff07a119a47d0cc1bf

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 71bdb7be12396254b953ebe22ff9735f2f1b8764

servo/components/style/values/specified/mod.rs

@@ -311,11 +311,22 @@ impl BorderStyle {
     }
 }
 
+/// Time unit.
+#[derive(Clone, Copy, Debug, HasViewportPercentage, PartialEq, Eq)]
+#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
+pub enum TimeUnit {
+    /// `s`
+    Second,
+    /// `ms`
+    Millisecond,
+}
+
 /// A time in seconds according to CSS-VALUES § 6.2.
-#[derive(Clone, Copy, Debug, HasViewportPercentage, PartialEq, PartialOrd)]
+#[derive(Clone, Copy, Debug, HasViewportPercentage, PartialEq)]
 #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
 pub struct Time {
     seconds: CSSFloat,
+    unit: TimeUnit,
     was_calc: bool,
 }
 
@@ -324,6 +335,7 @@ impl Time {
     pub fn from_seconds(seconds: CSSFloat) -> Self {
         Time {
             seconds: seconds,
+            unit: TimeUnit::Second,
             was_calc: false,
         }
     }
@@ -345,14 +357,15 @@ impl Time {
         from_calc: bool)
         -> Result<Time, ()>
     {
-        let seconds = match_ignore_ascii_case! { unit,
-            "s" => value,
-            "ms" => value / 1000.0,
+        let (seconds, unit) = match_ignore_ascii_case! { unit,
+            "s" => (value, TimeUnit::Second),
+            "ms" => (value / 1000.0, TimeUnit::Millisecond),
             _ => return Err(())
         };
 
         Ok(Time {
             seconds: seconds,
+            unit: unit,
             was_calc: from_calc,
         })
     }
@@ -361,6 +374,7 @@ impl Time {
     pub fn from_calc(seconds: CSSFloat) -> Self {
         Time {
             seconds: seconds,
+            unit: TimeUnit::Second,
             was_calc: true,
         }
     }
@@ -409,6 +423,7 @@ impl ToComputedValue for Time {
     fn from_computed_value(computed: &Self::ComputedValue) -> Self {
         Time {
             seconds: computed.seconds(),
+            unit: TimeUnit::Second,
             was_calc: false,
         }
     }
@@ -425,7 +440,16 @@ impl ToCss for Time {
         if self.was_calc {
             dest.write_str("calc(")?;
         }
-        write!(dest, "{}s", self.seconds)?;
+        match self.unit {
+            TimeUnit::Second => {
+                self.seconds.to_css(dest)?;
+                dest.write_str("s")?;
+            }
+            TimeUnit::Millisecond => {
+                (self.seconds * 1000.).to_css(dest)?;
+                dest.write_str("ms")?;
+            }
+        }
         if self.was_calc {
             dest.write_str(")")?;
         }