From 461850d5e60dafb449c9610363cbdc1b18feef3b Mon Sep 17 00:00:00 2001
From: Ziran Sun <zsun@igalia.com>
Date: Mon, 11 Jul 2022 08:37:44 +0000
Subject: [PATCH] style: make contain-intrinsic-size *animatable*

Differential Revision: https://phabricator.services.mozilla.com/D151231
---
 components/style/properties/longhands/position.mako.rs | 3 +--
 components/style/values/generics/box.rs                | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/style/properties/longhands/position.mako.rs b/components/style/properties/longhands/position.mako.rs
index d757e5663d9..70459cdfe72 100644
--- a/components/style/properties/longhands/position.mako.rs
+++ b/components/style/properties/longhands/position.mako.rs
@@ -465,7 +465,6 @@ ${helpers.predefined_type(
 )}
 
 % for (size, logical) in ALL_SIZES:
-    // FIXME: Bug 1778296, "contain-intrinsic-*" properties should be animatable.
     ${helpers.predefined_type(
         "contain-intrinsic-" + size,
         "ContainIntrinsicSize",
@@ -475,6 +474,6 @@ ${helpers.predefined_type(
         logical=logical,
         gecko_pref="layout.css.contain-intrinsic-size.enabled",
         spec="https://drafts.csswg.org/css-sizing-4/#intrinsic-size-override",
-        animation_value_type="none",
+        animation_value_type="NonNegativeLength",
     )}
 % endfor
diff --git a/components/style/values/generics/box.rs b/components/style/values/generics/box.rs
index 218afd477fc..b64852e645a 100644
--- a/components/style/values/generics/box.rs
+++ b/components/style/values/generics/box.rs
@@ -88,6 +88,8 @@ impl<L> ToAnimatedZero for VerticalAlign<L> {
     PartialEq,
     SpecifiedValueInfo,
     ToComputedValue,
+    ToAnimatedValue,
+    ToAnimatedZero,
     ToResolvedValue,
     ToShmem,
 )]