diff --git a/components/style/values/computed/easing.rs b/components/style/values/computed/easing.rs
index 7bee63f0346..c75767c13e6 100644
--- a/components/style/values/computed/easing.rs
+++ b/components/style/values/computed/easing.rs
@@ -24,8 +24,8 @@ impl ComputedLinearStop {
     ) -> PiecewiseLinearFunctionBuildParameters {
         (
             x.output,
-            x.input_start.into_rust().map(|x| x.0),
-            x.input_end.into_rust().map(|x| x.0),
+            x.input.into_rust().map(|x| x.0),
+            None,
         )
     }
 }
diff --git a/components/style/values/generics/easing.rs b/components/style/values/generics/easing.rs
index ef3c089b3db..7407fe9dd5f 100644
--- a/components/style/values/generics/easing.rs
+++ b/components/style/values/generics/easing.rs
@@ -27,12 +27,9 @@ use crate::values::generics::Optional;
 pub struct LinearStop<Number, Percentage> {
     /// Output of the function at the given point.
     pub output: Number,
-    /// Playback progress at which this output starts.
+    /// Playback progress at which this output is given.
     #[css(skip_if = "Optional::is_none")]
-    pub input_start: Optional<Percentage>,
-    /// Playback progress at which this output ends.
-    #[css(skip_if = "Optional::is_none")]
-    pub input_end: Optional<Percentage>,
+    pub input: Optional<Percentage>,
 }
 
 /// A generic easing function.
diff --git a/components/style/values/specified/easing.rs b/components/style/values/specified/easing.rs
index b6883627cea..d2535101bde 100644
--- a/components/style/values/specified/easing.rs
+++ b/components/style/values/specified/easing.rs
@@ -12,7 +12,7 @@ use crate::values::generics::easing::{
 };
 use crate::values::generics::easing::{StepPosition, TimingKeyword};
 use crate::values::specified::{Integer, Number, Percentage};
-use cssparser::Parser;
+use cssparser::{Delimiter, Parser, Token};
 use selectors::parser::SelectorParseErrorKind;
 use std::iter::FromIterator;
 use style_traits::{ParseError, StyleParseErrorKind};
@@ -20,6 +20,8 @@ use style_traits::{ParseError, StyleParseErrorKind};
 /// A specified timing function.
 pub type TimingFunction = GenericTimingFunction<Integer, Number, Percentage>;
 
+type LinearStop = GenericLinearStop<Number, Percentage>;
+
 #[cfg(feature = "gecko")]
 fn linear_timing_function_enabled() -> bool {
     static_prefs::pref!("layout.css.linear-easing-function.enabled")
@@ -115,23 +117,35 @@ impl TimingFunction {
         if input.is_exhausted() {
             return Ok(GenericTimingFunction::LinearFunction(crate::OwnedSlice::default()))
         }
-        let entries = input.parse_comma_separated(|i| {
-            let mut input_start = i.try_parse(|i| Percentage::parse(context, i)).ok();
-            let mut input_end = i.try_parse(|i| Percentage::parse(context, i)).ok();
+        let mut result = vec![];
+        loop {
+            input.parse_until_before(Delimiter::Comma, |i| {
+                let mut input_start = i.try_parse(|i| Percentage::parse(context, i)).ok();
+                let mut input_end = i.try_parse(|i| Percentage::parse(context, i)).ok();
 
-            let output = Number::parse(context, i)?;
-            if input_start.is_none() {
-                debug_assert!(input_end.is_none(), "Input end parsed without input start?");
-                input_start = i.try_parse(|i| Percentage::parse(context, i)).ok();
-                input_end = i.try_parse(|i| Percentage::parse(context, i)).ok();
+                let output = Number::parse(context, i)?;
+                if input_start.is_none() {
+                    debug_assert!(input_end.is_none(), "Input end parsed without input start?");
+                    input_start = i.try_parse(|i| Percentage::parse(context, i)).ok();
+                    input_end = i.try_parse(|i| Percentage::parse(context, i)).ok();
+                }
+                result.push(LinearStop { output, input: input_start.into() });
+                if input_end.is_some() {
+                    debug_assert!(input_start.is_some(), "Input end valid but not input start?");
+                    result.push(LinearStop { output, input: input_end.into() });
+                }
+
+                Ok(())
+            })?;
+
+            match input.next() {
+                Err(_) => break,
+                Ok(&Token::Comma) => continue,
+                Ok(_) => unreachable!(),
             }
-            Ok(GenericLinearStop {
-                output,
-                input_start: input_start.into(),
-                input_end: input_end.into()
-            })
-        })?;
-        Ok(GenericTimingFunction::LinearFunction(crate::OwnedSlice::from(entries)))
+        }
+
+        Ok(GenericTimingFunction::LinearFunction(crate::OwnedSlice::from(result)))
     }
 }
 
@@ -157,13 +171,8 @@ impl TimingFunction {
             GenericTimingFunction::LinearFunction(steps) => {
                 let iter = steps.iter().map(|e| ComputedLinearStop {
                     output: e.output.get(),
-                    input_start: e
-                        .input_start
-                        .into_rust()
-                        .map(|x| ComputedPercentage(x.get()))
-                        .into(),
-                    input_end: e
-                        .input_end
+                    input: e
+                        .input
                         .into_rust()
                         .map(|x| ComputedPercentage(x.get()))
                         .into(),