Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Switch replaced layout to app units (#32625)

Browse source
This commit is contained in:
Oriol Brufau 2024-06-26 18:19:24 +02:00 • committed by GitHub
parent a730469b70
commit f055964792
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 73 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/layout_2020/flexbox/layout.rs
View file

@ -25,7 +25,7 @@ use crate::cell::ArcRefCell;
use crate::context::LayoutContext; use crate::context::LayoutContext;
use crate::formatting_contexts::{Baselines, IndependentFormattingContext, IndependentLayout}; use crate::formatting_contexts::{Baselines, IndependentFormattingContext, IndependentLayout};
use crate::fragment_tree::{BoxFragment, CollapsedBlockMargins, Fragment}; use crate::fragment_tree::{BoxFragment, CollapsedBlockMargins, Fragment};
use crate::geom::{AuOrAuto, LengthOrAuto, LogicalRect, LogicalSides, LogicalVec2}; use crate::geom::{AuOrAuto, LogicalRect, LogicalSides, LogicalVec2};
use crate::positioned::{AbsolutelyPositionedBox, PositioningContext, PositioningContextLength}; use crate::positioned::{AbsolutelyPositionedBox, PositioningContext, PositioningContextLength};
use crate::sizing::ContentSizes; use crate::sizing::ContentSizes;
use crate::style_ext::{Clamp, ComputedValuesExt}; use crate::style_ext::{Clamp, ComputedValuesExt};
@ -1187,8 +1187,9 @@ impl<'a> FlexItem<'a> {
inline: replaced inline: replaced
.style .style
.content_box_size(flex_context.containing_block, &pbm) .content_box_size(flex_context.containing_block, &pbm)
.inline, .inline
block: LengthOrAuto::LengthPercentage(size.into()), .map(Au::from),
block: AuOrAuto::LengthPercentage(size),
}); });
let size = replaced.contents.used_size_as_if_inline_element( let size = replaced.contents.used_size_as_if_inline_element(
flex_context.containing_block, flex_context.containing_block,

138
components/layout_2020/replaced.rs
View file

@ -17,7 +17,6 @@ use servo_arc::Arc as ServoArc;
use style::properties::ComputedValues; use style::properties::ComputedValues;
use style::servo::url::ComputedUrl; use style::servo::url::ComputedUrl;
use style::values::computed::image::Image as ComputedImage; use style::values::computed::image::Image as ComputedImage;
use style::values::computed::{Length, LengthOrAuto};
use style::values::CSSFloat; use style::values::CSSFloat;
use style::Zero; use style::Zero;
use url::Url; use url::Url;
@ -29,7 +28,7 @@ use crate::fragment_tree::{BaseFragmentInfo, Fragment, IFrameFragment, ImageFrag
use crate::geom::{LogicalRect, LogicalVec2, PhysicalSize}; use crate::geom::{LogicalRect, LogicalVec2, PhysicalSize};
use crate::sizing::ContentSizes; use crate::sizing::ContentSizes;
use crate::style_ext::{Clamp, ComputedValuesExt, PaddingBorderMargin}; use crate::style_ext::{Clamp, ComputedValuesExt, PaddingBorderMargin};
use crate::ContainingBlock; use crate::{AuOrAuto, ContainingBlock};
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
pub(crate) struct ReplacedContent { pub(crate) struct ReplacedContent {
@ -71,8 +70,8 @@ impl IntrinsicSizes {
}; };
Self { Self {
width: Some(Length::new(width).into()), width: Some(Au::from_f32_px(width)),
height: Some(Length::new(height).into()), height: Some(Au::from_f32_px(height)),
ratio, ratio,
} }
} }
@ -354,18 +353,25 @@ impl ReplacedContent {
&self, &self,
containing_block: &ContainingBlock, containing_block: &ContainingBlock,
style: &ComputedValues, style: &ComputedValues,
box_size: Option<LogicalVec2<LengthOrAuto>>, box_size: Option<LogicalVec2<AuOrAuto>>,
pbm: &PaddingBorderMargin, pbm: &PaddingBorderMargin,
) -> LogicalVec2<Au> { ) -> LogicalVec2<Au> {
let mode = style.writing_mode; let mode = style.writing_mode;
let intrinsic_size = self.flow_relative_intrinsic_size(style); let intrinsic_size = self.flow_relative_intrinsic_size(style);
let intrinsic_ratio = self.inline_size_over_block_size_intrinsic_ratio(style); let intrinsic_ratio = self.inline_size_over_block_size_intrinsic_ratio(style);
let box_size = box_size.unwrap_or(style.content_box_size(containing_block, pbm)); let box_size = box_size.unwrap_or(
let max_box_size = style.content_max_box_size(containing_block, pbm); style
.content_box_size(containing_block, pbm)
.map(|v| v.map(Au::from)),
);
let max_box_size = style
.content_max_box_size(containing_block, pbm)
.map(|v| v.map(Au::from));
let min_box_size = style let min_box_size = style
.content_min_box_size(containing_block, pbm) .content_min_box_size(containing_block, pbm)
.auto_is(Length::zero); .map(|v| v.map(Au::from))
.auto_is(Au::zero);
let default_object_size = || { let default_object_size = || {
// FIXME: // FIXME:
@ -375,47 +381,41 @@ impl ReplacedContent {
// “height of the largest rectangle that has a 2:1 ratio, has a height not greater // “height of the largest rectangle that has a 2:1 ratio, has a height not greater
// than 150px, and has a width not greater than the device width.” // than 150px, and has a width not greater than the device width.”
LogicalVec2::from_physical_size( LogicalVec2::from_physical_size(
&PhysicalSize::new(Length::new(300.), Length::new(150.)), &PhysicalSize::new(Au::from_px(300), Au::from_px(150)),
mode, mode,
) )
}; };
let clamp = |inline_size: Au, block_size: Au| LogicalVec2 { let clamp = |inline_size: Au, block_size: Au| LogicalVec2 {
inline: inline_size.clamp_between_extremums( inline: inline_size.clamp_between_extremums(min_box_size.inline, max_box_size.inline),
min_box_size.inline.into(), block: block_size.clamp_between_extremums(min_box_size.block, max_box_size.block),
max_box_size.inline.map(|t| t.into()),
),
block: block_size.clamp_between_extremums(
min_box_size.block.into(),
max_box_size.block.map(|t| t.into()),
),
}; };
// https://drafts.csswg.org/css2/visudet.html#min-max-widths // https://drafts.csswg.org/css2/visudet.html#min-max-widths
// https://drafts.csswg.org/css2/visudet.html#min-max-heights // https://drafts.csswg.org/css2/visudet.html#min-max-heights
match (box_size.inline, box_size.block) { match (box_size.inline, box_size.block) {
(LengthOrAuto::LengthPercentage(inline), LengthOrAuto::LengthPercentage(block)) => { (AuOrAuto::LengthPercentage(inline), AuOrAuto::LengthPercentage(block)) => {
clamp(inline.into(), block.into()) clamp(inline, block)
}, },
(LengthOrAuto::LengthPercentage(inline), LengthOrAuto::Auto) => { (AuOrAuto::LengthPercentage(inline), AuOrAuto::Auto) => {
let block = if let Some(i_over_b) = intrinsic_ratio { let block = if let Some(i_over_b) = intrinsic_ratio {
inline / i_over_b inline.scale_by(1.0 / i_over_b)
} else if let Some(block) = intrinsic_size.block { } else if let Some(block) = intrinsic_size.block {
block.into() block
} else { } else {
default_object_size().block default_object_size().block
}; };
clamp(inline.into(), block.into()) clamp(inline, block)
}, },
(LengthOrAuto::Auto, LengthOrAuto::LengthPercentage(block)) => { (AuOrAuto::Auto, AuOrAuto::LengthPercentage(block)) => {
let inline = if let Some(i_over_b) = intrinsic_ratio { let inline = if let Some(i_over_b) = intrinsic_ratio {
block * i_over_b block.scale_by(i_over_b)
} else if let Some(inline) = intrinsic_size.inline { } else if let Some(inline) = intrinsic_size.inline {
inline.into() inline
} else { } else {
default_object_size().inline default_object_size().inline
}; };
clamp(inline.into(), block.into()) clamp(inline, block)
}, },
(LengthOrAuto::Auto, LengthOrAuto::Auto) => { (AuOrAuto::Auto, AuOrAuto::Auto) => {
let inline_size = let inline_size =
match (intrinsic_size.inline, intrinsic_size.block, intrinsic_ratio) { match (intrinsic_size.inline, intrinsic_size.block, intrinsic_ratio) {
(Some(inline), _, _) => inline, (Some(inline), _, _) => inline,
@ -441,7 +441,7 @@ impl ReplacedContent {
// does not itself depend on the replaced element's width, // does not itself depend on the replaced element's width,
// then the used value of 'width' is calculated from the constraint // then the used value of 'width' is calculated from the constraint
// equation used for block-level, non-replaced elements in normal flow.” // equation used for block-level, non-replaced elements in normal flow.”
_ => default_object_size().inline.into(), _ => default_object_size().inline,
}; };
let block_size = if let Some(block) = intrinsic_size.block { let block_size = if let Some(block) = intrinsic_size.block {
block block
@ -449,7 +449,7 @@ impl ReplacedContent {
// “used width” in CSS 2 is what we just computed above // “used width” in CSS 2 is what we just computed above
inline_size.scale_by(1.0 / i_over_b) inline_size.scale_by(1.0 / i_over_b)
} else { } else {
default_object_size().block.into() default_object_size().block
}; };
let i_over_b = if let Some(i_over_b) = intrinsic_ratio { let i_over_b = if let Some(i_over_b) = intrinsic_ratio {
@ -463,18 +463,18 @@ impl ReplacedContent {
// 'width' and 'height' specified as 'auto', the algorithm is as follows” // 'width' and 'height' specified as 'auto', the algorithm is as follows”
enum Violation { enum Violation {
None, None,
Below(Length), Below(Au),
Above(Length), Above(Au),
} }
let violation = |size: Au, min_size, mut max_size: Option<Length>| { let violation = |size: Au, min_size: Au, mut max_size: Option<Au>| {
if let Some(max) = max_size.as_mut() { if let Some(max) = max_size.as_mut() {
max.max_assign(min_size); max.max_assign(min_size);
} }
if size < min_size.into() { if size < min_size {
return Violation::Below(min_size); return Violation::Below(min_size);
} }
match max_size { match max_size {
Some(max_size) if size > max_size.into() => Violation::Above(max_size), Some(max_size) if size > max_size => Violation::Above(max_size),
_ => Violation::None, _ => Violation::None,
} }
}; };
@ -489,80 +489,80 @@ impl ReplacedContent {
}, },
// Row 2. // Row 2.
(Violation::Above(max_inline_size), Violation::None) => LogicalVec2 { (Violation::Above(max_inline_size), Violation::None) => LogicalVec2 {
inline: max_inline_size.into(), inline: max_inline_size,
block: (max_inline_size / i_over_b).max(min_box_size.block).into(), block: max_inline_size
.scale_by(1.0 / i_over_b)
.max(min_box_size.block),
}, },
// Row 3. // Row 3.
(Violation::Below(min_inline_size), Violation::None) => LogicalVec2 { (Violation::Below(min_inline_size), Violation::None) => LogicalVec2 {
inline: min_inline_size.into(), inline: min_inline_size,
block: (min_inline_size / i_over_b) block: min_inline_size
.clamp_below_max(max_box_size.block) .scale_by(1.0 / i_over_b)
.into(), .clamp_below_max(max_box_size.block),
}, },
// Row 4. // Row 4.
(Violation::None, Violation::Above(max_block_size)) => LogicalVec2 { (Violation::None, Violation::Above(max_block_size)) => LogicalVec2 {
inline: (max_block_size * i_over_b).max(min_box_size.inline).into(), inline: max_block_size.scale_by(i_over_b).max(min_box_size.inline),
block: max_block_size.into(), block: max_block_size,
}, },
// Row 5. // Row 5.
(Violation::None, Violation::Below(min_block_size)) => LogicalVec2 { (Violation::None, Violation::Below(min_block_size)) => LogicalVec2 {
inline: (min_block_size * i_over_b) inline: min_block_size
.clamp_below_max(max_box_size.inline) .scale_by(i_over_b)
.into(), .clamp_below_max(max_box_size.inline),
block: min_block_size.into(), block: min_block_size,
}, },
// Rows 6-7. // Rows 6-7.
(Violation::Above(max_inline_size), Violation::Above(max_block_size)) => { (Violation::Above(max_inline_size), Violation::Above(max_block_size)) => {
if max_inline_size.px() / inline_size.to_f32_px() <= if max_inline_size.0 * block_size.0 <= max_block_size.0 * inline_size.0 {
max_block_size.px() / block_size.to_f32_px()
{
// Row 6. // Row 6.
LogicalVec2 { LogicalVec2 {
inline: max_inline_size.into(), inline: max_inline_size,
block: (max_inline_size / i_over_b).max(min_box_size.block).into(), block: max_inline_size
.scale_by(1.0 / i_over_b)
.max(min_box_size.block),
} }
} else { } else {
// Row 7. // Row 7.
LogicalVec2 { LogicalVec2 {
inline: (max_block_size * i_over_b).max(min_box_size.inline).into(), inline: max_block_size.scale_by(i_over_b).max(min_box_size.inline),
block: max_block_size.into(), block: max_block_size,
} }
} }
}, },
// Rows 8-9. // Rows 8-9.
(Violation::Below(min_inline_size), Violation::Below(min_block_size)) => { (Violation::Below(min_inline_size), Violation::Below(min_block_size)) => {
if min_inline_size.px() / inline_size.to_f32_px() <= if min_inline_size.0 * block_size.0 <= min_block_size.0 * inline_size.0 {
min_block_size.px() / block_size.to_f32_px()
{
// Row 8. // Row 8.
LogicalVec2 { LogicalVec2 {
inline: (min_block_size * i_over_b) inline: min_block_size
.clamp_below_max(max_box_size.inline) .scale_by(i_over_b)
.into(), .clamp_below_max(max_box_size.inline),
block: min_block_size.into(), block: min_block_size,
} }
} else { } else {
// Row 9. // Row 9.
LogicalVec2 { LogicalVec2 {
inline: min_inline_size.into(), inline: min_inline_size,
block: (min_inline_size / i_over_b) block: min_inline_size
.clamp_below_max(max_box_size.block) .scale_by(1.0 / i_over_b)
.into(), .clamp_below_max(max_box_size.block),
} }
} }
}, },
// Row 10. // Row 10.
(Violation::Below(min_inline_size), Violation::Above(max_block_size)) => { (Violation::Below(min_inline_size), Violation::Above(max_block_size)) => {
LogicalVec2 { LogicalVec2 {
inline: min_inline_size.into(), inline: min_inline_size,
block: max_block_size.into(), block: max_block_size,
} }
}, },
// Row 11. // Row 11.
(Violation::Above(max_inline_size), Violation::Below(min_block_size)) => { (Violation::Above(max_inline_size), Violation::Below(min_block_size)) => {
LogicalVec2 { LogicalVec2 {
inline: max_inline_size.into(), inline: max_inline_size,
block: min_block_size.into(), block: min_block_size,
} }
}, },
} }