mirror of
https://github.com/servo/servo.git
synced 2025-08-11 16:35:33 +01:00
Fix inline content sizes of intrinsic element with indefinite block size (#34152)
To compute the min-content and max-content inline sizes of a replaced element, we were only using the aspect ratio to transfer definite block sizes resulting from clamping the preferred block size between the min and max block sizes. However, if the preferred block size is indefinite, then we weren't transfering the min and max through the aspect ratio. This patch adds a `SizeConstraint` enum that can represent these cases, and a `ConstraintSpace` struct analogous to `IndefiniteContainingBlock` but with no inline size, and a `SizeConstraint` block size. Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
parent
72971bd271
commit
b28260aa13
15 changed files with 297 additions and 292 deletions
|
@ -17,6 +17,7 @@ use style::Zero;
|
|||
use style_traits::CSSPixel;
|
||||
|
||||
use crate::sizing::ContentSizes;
|
||||
use crate::style_ext::Clamp;
|
||||
use crate::ContainingBlock;
|
||||
|
||||
pub type PhysicalPoint<U> = euclid::Point2D<U, CSSPixel>;
|
||||
|
@ -848,3 +849,45 @@ impl Size<Au> {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Represents the sizing constraint that the preferred, min and max sizing properties
|
||||
/// impose on one axis.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Serialize)]
|
||||
pub(crate) enum SizeConstraint {
|
||||
/// Represents a definite preferred size, clamped by minimum and maximum sizes (if any).
|
||||
Definite(Au),
|
||||
/// Represents an indefinite preferred size that allows a range of values between
|
||||
/// the first argument (minimum size) and the second one (maximum size).
|
||||
MinMax(Au, Option<Au>),
|
||||
}
|
||||
|
||||
impl Default for SizeConstraint {
|
||||
#[inline]
|
||||
fn default() -> Self {
|
||||
Self::MinMax(Au::default(), None)
|
||||
}
|
||||
}
|
||||
|
||||
impl SizeConstraint {
|
||||
#[inline]
|
||||
pub(crate) fn new(preferred_size: Option<Au>, min_size: Au, max_size: Option<Au>) -> Self {
|
||||
preferred_size.map_or_else(
|
||||
|| Self::MinMax(min_size, max_size),
|
||||
|size| Self::Definite(size.clamp_between_extremums(min_size, max_size)),
|
||||
)
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub(crate) fn to_definite(self) -> Option<Au> {
|
||||
match self {
|
||||
Self::Definite(size) => Some(size),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub(crate) fn to_auto_or(self) -> AutoOr<Au> {
|
||||
self.to_definite()
|
||||
.map_or(AutoOr::Auto, AutoOr::LengthPercentage)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue