Bug 1786147 - Move line-clamp out of mako and do some adjacent clean-up. r=boris

No behavior change, but simplifies the following patch.

Differential Revision: https://phabricator.services.mozilla.com/D155180

layout/generic/nsFlexContainerFrame.cpp

@@ -5865,5 +5865,5 @@ uint32_t nsFlexContainerFrame::GetLineClampValue() const {
     return 0;
   }
 
-  return StyleDisplay()->mLineClamp;
+  return StyleDisplay()->mWebkitLineClamp;
 }

layout/style/ServoBindings.toml

@@ -438,6 +438,7 @@ cbindgen-types = [
     { gecko = "StyleTextJustify", servo = "crate::values::computed::TextJustify" },
     { gecko = "StyleMozControlCharacterVisibility", servo = "crate::values::computed::text::MozControlCharacterVisibility" },
     { gecko = "StyleLineBreak", servo = "crate::values::computed::LineBreak" },
+    { gecko = "StyleLineClamp", servo = "crate::values::computed::LineClamp" },
     { gecko = "StyleUserSelect", servo = "crate::values::computed::UserSelect" },
     { gecko = "StyleBreakBetween", servo = "crate::values::computed::BreakBetween" },
     { gecko = "StyleBreakWithin", servo = "crate::values::computed::BreakWithin" },

layout/style/nsStyleStruct.cpp

@@ -2248,7 +2248,7 @@ nsStyleDisplay::nsStyleDisplay(const Document& aDocument)
       mPerspectiveOrigin(Position::FromPercentage(0.5f)),
       mVerticalAlign(
           StyleVerticalAlign::Keyword(StyleVerticalAlignKeyword::Baseline)),
-      mLineClamp(0),
+      mWebkitLineClamp(0),
       mShapeMargin(LengthPercentage::Zero()),
       mShapeOutside(StyleShapeOutside::None()) {
   MOZ_COUNT_CTOR(nsStyleDisplay);
@@ -2301,7 +2301,7 @@ nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource)
       mChildPerspective(aSource.mChildPerspective),
       mPerspectiveOrigin(aSource.mPerspectiveOrigin),
       mVerticalAlign(aSource.mVerticalAlign),
-      mLineClamp(aSource.mLineClamp),
+      mWebkitLineClamp(aSource.mWebkitLineClamp),
       mShapeImageThreshold(aSource.mShapeImageThreshold),
       mShapeMargin(aSource.mShapeMargin),
       mShapeOutside(aSource.mShapeOutside) {
@@ -2527,7 +2527,7 @@ nsChangeHint nsStyleDisplay::CalcDifference(
     }
   }
 
-  if (mLineClamp != aNewData.mLineClamp) {
+  if (mWebkitLineClamp != aNewData.mWebkitLineClamp) {
     hint |= NS_STYLE_HINT_REFLOW;
   }
 

layout/style/nsStyleStruct.h

@@ -1316,7 +1316,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
 
   mozilla::StyleVerticalAlign mVerticalAlign;
 
-  uint32_t mLineClamp;
+  mozilla::StyleLineClamp mWebkitLineClamp;
 
   // The threshold used for extracting a shape from shape-outside: <image>.
   float mShapeImageThreshold = 0.0f;

servo/components/style/macros.rs

@@ -65,46 +65,6 @@ macro_rules! try_match_ident_ignore_ascii_case {
     }}
 }
 
-macro_rules! define_keyword_type {
-    ($name:ident, $css:expr) => {
-        #[allow(missing_docs)]
-        #[derive(
-            Animate,
-            Clone,
-            ComputeSquaredDistance,
-            Copy,
-            MallocSizeOf,
-            PartialEq,
-            SpecifiedValueInfo,
-            ToAnimatedValue,
-            ToAnimatedZero,
-            ToComputedValue,
-            ToCss,
-            ToResolvedValue,
-            ToShmem,
-        )]
-        pub struct $name;
-
-        impl fmt::Debug for $name {
-            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                f.write_str($css)
-            }
-        }
-
-        impl $crate::parser::Parse for $name {
-            fn parse<'i, 't>(
-                _context: &$crate::parser::ParserContext,
-                input: &mut ::cssparser::Parser<'i, 't>,
-            ) -> Result<$name, ::style_traits::ParseError<'i>> {
-                input
-                    .expect_ident_matching($css)
-                    .map(|_| $name)
-                    .map_err(|e| e.into())
-            }
-        }
-    };
-}
-
 #[cfg(feature = "servo")]
 macro_rules! local_name {
     ($s:tt) => {

servo/components/style/properties/data.py

@@ -485,6 +485,7 @@ class Longhand(Property):
                 "JustifyItems",
                 "JustifySelf",
                 "LineBreak",
+                "LineClamp",
                 "MasonryAutoFlow",
                 "MozForceBrokenImageIcon",
                 "text::MozControlCharacterVisibility",
@@ -502,7 +503,6 @@ class Longhand(Property):
                 "OverflowWrap",
                 "OverscrollBehavior",
                 "Percentage",
-                "PositiveIntegerOrNone",
                 "PrintColorAdjust",
                 "Resize",
                 "RubyPosition",

servo/components/style/properties/gecko.mako.rs

@@ -38,7 +38,7 @@ use crate::selector_parser::PseudoElement;
 use servo_arc::{Arc, RawOffsetArc, UniqueArc};
 use std::mem::{forget, MaybeUninit};
 use std::{cmp, ops, ptr};
-use crate::values::{self, CustomIdent, Either, KeyframesName, None_};
+use crate::values::{self, CustomIdent, KeyframesName};
 use crate::values::computed::{Percentage, TransitionProperty};
 use crate::values::computed::BorderStyle;
 use crate::values::computed::font::FontSize;
@@ -1127,9 +1127,7 @@ fn static_assert() {
     ${impl_copy_animation_value(ident, gecko_ffi_name)}
 </%def>
 
-<% skip_box_longhands= """display
-                          clear
-                          -webkit-line-clamp""" %>
+<% skip_box_longhands= """display clear""" %>
 <%self:impl_trait style_struct_name="Box" skip_longhands="${skip_box_longhands}">
     #[inline]
     pub fn set_display(&mut self, v: longhands::display::computed_value::T) {
@@ -1169,28 +1167,6 @@ fn static_assert() {
         gecko_inexhaustive=True,
     ) %>
     ${impl_keyword('clear', 'mBreakType', clear_keyword)}
-
-    #[allow(non_snake_case)]
-    pub fn set__webkit_line_clamp(&mut self, v: longhands::_webkit_line_clamp::computed_value::T) {
-        self.gecko.mLineClamp = match v {
-            Either::First(n) => n.0 as u32,
-            Either::Second(None_) => 0,
-        };
-    }
-
-    ${impl_simple_copy('_webkit_line_clamp', 'mLineClamp')}
-
-    #[allow(non_snake_case)]
-    pub fn clone__webkit_line_clamp(&self) -> longhands::_webkit_line_clamp::computed_value::T {
-        match self.gecko.mLineClamp {
-            0 => Either::Second(None_),
-            n => {
-                debug_assert!(n <= std::i32::MAX as u32);
-                Either::First((n as i32).into())
-            }
-        }
-    }
-
 </%self:impl_trait>
 
 <%def name="simple_image_array_property(name, shorthand, field_name)">

servo/components/style/properties/helpers.mako.rs

@@ -119,8 +119,6 @@
             use crate::values::computed::{Context, ToComputedValue};
             #[allow(unused_imports)]
             use crate::values::{computed, specified};
-            #[allow(unused_imports)]
-            use crate::values::{Auto, Either, None_};
             ${caller.body()}
         }
 
@@ -414,8 +412,6 @@
         #[allow(unused_imports)]
         use crate::properties::{UnparsedValue, ShorthandId};
         #[allow(unused_imports)]
-        use crate::values::{Auto, Either, None_};
-        #[allow(unused_imports)]
         use crate::error_reporting::ParseErrorReporter;
         #[allow(unused_imports)]
         use crate::properties::longhands;

servo/components/style/properties/longhands/box.mako.rs

@@ -543,16 +543,13 @@ ${helpers.predefined_type(
     spec="https://compat.spec.whatwg.org/#touch-action",
 )}
 
-// Note that we only implement -webkit-line-clamp as a single, longhand
-// property for now, but the spec defines line-clamp as a shorthand for separate
-// max-lines, block-ellipsis, and continue properties.
 ${helpers.predefined_type(
     "-webkit-line-clamp",
-    "PositiveIntegerOrNone",
-    "Either::Second(None_)",
+    "LineClamp",
+    "computed::LineClamp::none()",
     engines="gecko",
     gecko_pref="layout.css.webkit-line-clamp.enabled",
-    animation_value_type="Integer",
+    animation_value_type="ComputedValue",
     spec="https://drafts.csswg.org/css-overflow-3/#line-clamp",
 )}
 

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

@@ -378,6 +378,7 @@ trivial_to_animated_value!(ComputedAngle);
 trivial_to_animated_value!(ComputedUrl);
 trivial_to_animated_value!(bool);
 trivial_to_animated_value!(f32);
+trivial_to_animated_value!(i32);
 // Note: This implementation is for ToAnimatedValue of ShapeSource.
 //
 // SVGPathData uses Box<[T]>. If we want to derive ToAnimatedValue for all the

servo/components/style/values/computed/box.rs

@@ -4,12 +4,11 @@
 
 //! Computed types for box properties.
 
+use crate::values::animated::{Animate, Procedure};
 use crate::values::computed::length::{LengthPercentage, NonNegativeLength};
-use crate::values::computed::{Context, Number, ToComputedValue};
+use crate::values::computed::{Context, Integer, Number, ToComputedValue};
 use crate::values::generics::box_::AnimationIterationCount as GenericAnimationIterationCount;
-use crate::values::generics::box_::Perspective as GenericPerspective;
-use crate::values::generics::box_::VerticalAlign as GenericVerticalAlign;
-use crate::values::generics::box_::ContainIntrinsicSize as GenericContainIntrinsicSize;
+use crate::values::generics::box_::{GenericLineClamp, GenericPerspective, GenericVerticalAlign, GenericContainIntrinsicSize};
 use crate::values::specified::box_ as specified;
 
 pub use crate::values::specified::box_::{
@@ -30,6 +29,22 @@ pub type AnimationIterationCount = GenericAnimationIterationCount<Number>;
 /// A computed value for the `contain-intrinsic-size` property.
 pub type ContainIntrinsicSize = GenericContainIntrinsicSize<NonNegativeLength>;
 
+/// A computed value for the `line-clamp` property.
+pub type LineClamp = GenericLineClamp<Integer>;
+
+impl Animate for LineClamp {
+    #[inline]
+    fn animate(&self, other: &Self, procedure: Procedure) -> Result<Self, ()> {
+        if self.is_none() != other.is_none() {
+            return Err(());
+        }
+        if self.is_none() {
+            return Ok(Self::none())
+        }
+        Ok(Self(self.0.animate(&other.0, procedure)?.max(1)))
+    }
+}
+
 impl AnimationIterationCount {
     /// Returns the value `1.0`.
     #[inline]

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

@@ -45,7 +45,7 @@ pub use self::border::{BorderImageRepeat, BorderImageSideWidth};
 pub use self::border::{BorderImageSlice, BorderImageWidth};
 pub use self::box_::{AnimationIterationCount, AnimationName, AnimationTimeline, Contain, ContainerName, ContainerType};
 pub use self::box_::{Appearance, BreakBetween, BreakWithin, Clear, ContentVisibility, ContainIntrinsicSize, Float};
-pub use self::box_::{Display, Overflow, OverflowAnchor, TransitionProperty};
+pub use self::box_::{Display, LineClamp, Overflow, OverflowAnchor, TransitionProperty};
 pub use self::box_::{OverflowClipBox, OverscrollBehavior, Perspective, Resize, ScrollbarGutter};
 pub use self::box_::{ScrollAxis, ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStop};
 pub use self::box_::{ScrollSnapStrictness, ScrollSnapType, ScrollTimelineName};
@@ -99,7 +99,6 @@ pub use self::ui::{Cursor, MozForceBrokenImageIcon, UserSelect};
 pub use super::specified::TextTransform;
 pub use super::specified::ViewportVariant;
 pub use super::specified::{BorderStyle, TextDecorationLine};
-pub use super::{Auto, Either, None_};
 pub use app_units::Au;
 
 #[cfg(feature = "gecko")]
@@ -839,9 +838,6 @@ impl From<CSSInteger> for PositiveInteger {
     }
 }
 
-/// A computed positive `<integer>` value or `none`.
-pub type PositiveIntegerOrNone = Either<PositiveInteger, None_>;
-
 /// rect(...) | auto
 pub type ClipRect = generics::GenericClipRect<LengthOrAuto>;
 

servo/components/style/values/generics/box.rs

@@ -107,7 +107,6 @@ pub enum GenericContainIntrinsicSize<L> {
 pub use self::GenericContainIntrinsicSize as ContainIntrinsicSize;
 
 impl<L: ToCss> ToCss for ContainIntrinsicSize<L> {
-
     fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
     where
         W: Write,
@@ -123,6 +122,55 @@ impl<L: ToCss> ToCss for ContainIntrinsicSize<L> {
     }
 }
 
+/// Note that we only implement -webkit-line-clamp as a single, longhand
+/// property for now, but the spec defines line-clamp as a shorthand for
+/// separate max-lines, block-ellipsis, and continue properties.
+///
+/// https://drafts.csswg.org/css-overflow-3/#line-clamp
+#[derive(
+    Clone,
+    ComputeSquaredDistance,
+    Copy,
+    Debug,
+    MallocSizeOf,
+    PartialEq,
+    SpecifiedValueInfo,
+    ToComputedValue,
+    ToAnimatedValue,
+    ToAnimatedZero,
+    ToResolvedValue,
+    ToShmem,
+)]
+#[repr(transparent)]
+#[value_info(other_values = "auto")]
+pub struct GenericLineClamp<I>(pub I);
+
+pub use self::GenericLineClamp as LineClamp;
+
+impl<I: crate::Zero> LineClamp<I> {
+    /// Returns the `none` value.
+    pub fn none() -> Self {
+        Self(crate::Zero::zero())
+    }
+
+    /// Returns whether we're the `none` value.
+    pub fn is_none(&self) -> bool {
+        self.0.is_zero()
+    }
+}
+
+impl<I: crate::Zero + ToCss> ToCss for LineClamp<I> {
+    fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
+    where
+        W: Write,
+    {
+        if self.is_none() {
+            return dest.write_str("none");
+        }
+        self.0.to_css(dest)
+    }
+}
+
 /// https://drafts.csswg.org/css-animations/#animation-iteration-count
 #[derive(
     Clone,
@@ -135,13 +183,15 @@ impl<L: ToCss> ToCss for ContainIntrinsicSize<L> {
     ToResolvedValue,
     ToShmem,
 )]
-pub enum AnimationIterationCount<Number> {
+pub enum GenericAnimationIterationCount<Number> {
     /// A `<number>` value.
     Number(Number),
     /// The `infinite` keyword.
     Infinite,
 }
 
+pub use self::GenericAnimationIterationCount as AnimationIterationCount;
+
 /// A generic value for the `perspective` property.
 #[derive(
     Animate,

servo/components/style/values/mod.rs

@@ -48,9 +48,6 @@ pub fn normalize(v: CSSFloat) -> CSSFloat {
 /// A CSS integer value.
 pub type CSSInteger = i32;
 
-define_keyword_type!(None_, "none");
-define_keyword_type!(Auto, "auto");
-
 /// Serialize an identifier which is represented as an atom.
 #[cfg(feature = "gecko")]
 pub fn serialize_atom_identifier<W>(ident: &Atom, dest: &mut W) -> fmt::Result

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

@@ -8,11 +8,10 @@ use crate::custom_properties::Name as CustomPropertyName;
 use crate::parser::{Parse, ParserContext};
 use crate::properties::{LonghandId, PropertyDeclarationId};
 use crate::properties::{PropertyId, ShorthandId};
-use crate::values::generics::box_::AnimationIterationCount as GenericAnimationIterationCount;
-use crate::values::generics::box_::Perspective as GenericPerspective;
+use crate::values::generics::box_::{GenericAnimationIterationCount, GenericPerspective, GenericLineClamp};
 use crate::values::generics::box_::{GenericContainIntrinsicSize, GenericVerticalAlign, VerticalAlignKeyword};
 use crate::values::specified::length::{LengthPercentage, NonNegativeLength};
-use crate::values::specified::{AllowQuirks, Number};
+use crate::values::specified::{AllowQuirks, Number, Integer};
 use crate::values::{CustomIdent, KeyframesName, TimelineName};
 use crate::Atom;
 use cssparser::Parser;
@@ -646,6 +645,9 @@ impl SpecifiedValueInfo for Display {
 /// A specified value for the `contain-intrinsic-size` property.
 pub type ContainIntrinsicSize = GenericContainIntrinsicSize<NonNegativeLength>;
 
+/// A specified value for the `line-clamp` property.
+pub type LineClamp = GenericLineClamp<Integer>;
+
 /// A specified value for the `vertical-align` property.
 pub type VerticalAlign = GenericVerticalAlign<LengthPercentage>;
 
@@ -1471,6 +1473,21 @@ impl Parse for ContainIntrinsicSize {
     }
 }
 
+impl Parse for LineClamp {
+    /// none | <positive-integer>
+    fn parse<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<Self, ParseError<'i>> {
+        if let Ok(i) = input.try_parse(|i| crate::values::specified::PositiveInteger::parse(context, i))
+        {
+            return Ok(Self(i.0))
+        }
+        input.expect_ident_matching("none")?;
+        Ok(Self::none())
+    }
+}
+
 /// https://drafts.csswg.org/css-contain-2/#content-visibility
 #[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
 #[derive(

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

@@ -13,7 +13,7 @@ use super::generics::grid::{GridLine as GenericGridLine, TrackBreadth as Generic
 use super::generics::grid::{TrackList as GenericTrackList, TrackSize as GenericTrackSize};
 use super::generics::transform::IsParallelTo;
 use super::generics::{self, GreaterThanOrEqualToOne, NonNegative};
-use super::{CSSFloat, CSSInteger, Either, None_};
+use super::{CSSFloat, CSSInteger};
 use crate::context::QuirksMode;
 use crate::parser::{Parse, ParserContext};
 use crate::values::serialize_atom_identifier;
@@ -38,7 +38,7 @@ pub use self::border::{BorderImageRepeat, BorderImageSideWidth};
 pub use self::border::{BorderRadius, BorderSideWidth, BorderSpacing, BorderStyle};
 pub use self::box_::{AnimationIterationCount, AnimationName, AnimationTimeline, Contain, Display};
 pub use self::box_::{Appearance, BreakBetween, BreakWithin, ContainerName, ContainerType};
-pub use self::box_::{Clear, ContentVisibility, ContainIntrinsicSize, Float, Overflow, OverflowAnchor};
+pub use self::box_::{Clear, ContentVisibility, ContainIntrinsicSize, LineClamp, Float, Overflow, OverflowAnchor};
 pub use self::box_::{OverflowClipBox, OverscrollBehavior, Perspective, Resize, ScrollbarGutter};
 pub use self::box_::{ScrollAxis, ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStop};
 pub use self::box_::{ScrollSnapStrictness, ScrollSnapType, ScrollTimelineName};
@@ -708,9 +708,6 @@ impl Parse for PositiveInteger {
     }
 }
 
-/// A specified positive `<integer>` value or `none`.
-pub type PositiveIntegerOrNone = Either<PositiveInteger, None_>;
-
 /// The specified value of a grid `<track-breadth>`
 pub type TrackBreadth = GenericTrackBreadth<LengthPercentage>;
 

servo/ports/geckolib/cbindgen.toml

@@ -148,6 +148,7 @@ include = [
   "ZIndex",
   "TransformOrigin",
   "LineBreak",
+  "LineClamp",
   "WordBreak",
   "Contain",
   "ContainerType",