diff --git a/components/style/properties/longhands/ui.mako.rs b/components/style/properties/longhands/ui.mako.rs index 81b9f0ba2c1..184c1c94aa0 100644 --- a/components/style/properties/longhands/ui.mako.rs +++ b/components/style/properties/longhands/ui.mako.rs @@ -315,3 +315,14 @@ ${helpers.predefined_type( spec="https://github.com/w3c/csswg-drafts/issues/6674", rule_types_allowed=DEFAULT_RULES_EXCEPT_KEYFRAME, )} + +${helpers.predefined_type( + "scroll-timeline-axis", + "ScrollAxis", + "computed::ScrollAxis::default()", + engines="gecko", + animation_value_type="none", + gecko_pref="layout.css.scroll-linked-animations.enabled", + spec="https://github.com/w3c/csswg-drafts/issues/6674", + rule_types_allowed=DEFAULT_RULES_EXCEPT_KEYFRAME, +)} diff --git a/components/style/values/computed/box.rs b/components/style/values/computed/box.rs index 9207b2e5ef0..96071177a57 100644 --- a/components/style/values/computed/box.rs +++ b/components/style/values/computed/box.rs @@ -15,8 +15,9 @@ pub use crate::values::specified::box_::{ AnimationName, AnimationTimeline, Appearance, BreakBetween, BreakWithin, Clear as SpecifiedClear, Contain, ContainerName, ContainerType, ContentVisibility, Display, Float as SpecifiedFloat, Overflow, OverflowAnchor, OverflowClipBox, OverscrollBehavior, - ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStop, ScrollSnapStrictness, ScrollSnapType, - ScrollTimelineName, ScrollbarGutter, TouchAction, TransitionProperty, WillChange, + ScrollAxis, ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStop, ScrollSnapStrictness, + ScrollSnapType, ScrollTimelineName, ScrollbarGutter, TouchAction, TransitionProperty, + WillChange, }; /// A computed value for the `vertical-align` property. diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs index b9cebd60159..729959ed71e 100644 --- a/components/style/values/computed/mod.rs +++ b/components/style/values/computed/mod.rs @@ -49,7 +49,7 @@ pub use self::box_::{AnimationIterationCount, AnimationName, AnimationTimeline, pub use self::box_::{Appearance, BreakBetween, BreakWithin, Clear, ContentVisibility, Float}; pub use self::box_::{Display, Overflow, OverflowAnchor, TransitionProperty}; pub use self::box_::{OverflowClipBox, OverscrollBehavior, Perspective, Resize, ScrollbarGutter}; -pub use self::box_::{ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStop}; +pub use self::box_::{ScrollAxis, ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStop}; pub use self::box_::{ScrollSnapStrictness, ScrollSnapType, ScrollTimelineName}; pub use self::box_::{TouchAction, VerticalAlign, WillChange}; pub use self::color::{Color, ColorOrAuto, ColorPropertyValue, ColorScheme, PrintColorAdjust}; diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs index 2749b70c57d..c9583c96235 100644 --- a/components/style/values/specified/box.rs +++ b/components/style/values/specified/box.rs @@ -774,13 +774,13 @@ impl Default for Scroller { #[repr(u8)] pub enum ScrollAxis { /// The block axis of the scroll container. (Default.) - Block, + Block = 0, /// The inline axis of the scroll container. - Inline, + Inline = 1, /// The vertical block axis of the scroll container. - Vertical, + Vertical = 2, /// The horizontal axis of the scroll container. - Horizontal, + Horizontal = 3, } impl Default for ScrollAxis { diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs index a13167c7f38..fd931761562 100644 --- a/components/style/values/specified/mod.rs +++ b/components/style/values/specified/mod.rs @@ -40,7 +40,7 @@ pub use self::box_::{AnimationIterationCount, AnimationName, AnimationTimeline, pub use self::box_::{Appearance, BreakBetween, BreakWithin, ContainerName, ContainerType}; pub use self::box_::{Clear, ContentVisibility, Float, Overflow, OverflowAnchor}; pub use self::box_::{OverflowClipBox, OverscrollBehavior, Perspective, Resize, ScrollbarGutter}; -pub use self::box_::{ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStop}; +pub use self::box_::{ScrollAxis, ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStop}; pub use self::box_::{ScrollSnapStrictness, ScrollSnapType, ScrollTimelineName}; pub use self::box_::{TouchAction, TransitionProperty, VerticalAlign, WillChange}; pub use self::color::{Color, ColorOrAuto, ColorPropertyValue, ColorScheme, PrintColorAdjust};