Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-12 17:05:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

make ContainingBlock use Au for inline_size and block_size (#31370)

Browse source
This commit is contained in:
atbrakhi 2024-02-20 14:44:44 +05:30 • committed by GitHub
parent 2fa76916d3
commit 74c07db56c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 83 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/layout_2020/positioned.rs
View file

@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use app_units::Au;
use rayon::iter::IntoParallelRefMutIterator;
use rayon::prelude::{IndexedParallelIterator, ParallelIterator};
use serde::Serialize;
@ -19,7 +20,9 @@ use crate::formatting_contexts::IndependentFormattingContext;
use crate::fragment_tree::{
AbsoluteBoxOffsets, BoxFragment, CollapsedBlockMargins, Fragment, HoistedSharedFragment,
};
use crate::geom::{LengthOrAuto, LengthPercentageOrAuto, LogicalRect, LogicalSides, LogicalVec2};
use crate::geom::{
AuOrAuto, LengthOrAuto, LengthPercentageOrAuto, LogicalRect, LogicalSides, LogicalVec2,
};
use crate::style_ext::{ComputedValuesExt, DisplayInside};
use crate::{ContainingBlock, DefiniteContainingBlock};
@ -601,7 +604,7 @@ impl HoistedAbsolutelyPositionedBox {
// percentages may be resolved incorrectly.
let mut try_layout = |size| {
let containing_block_for_children = ContainingBlock {
inline_size,
inline_size: inline_size.into(),
block_size: size,
style: &non_replaced.style,
};
@ -623,18 +626,17 @@ impl HoistedAbsolutelyPositionedBox {
&mut positioning_context,
&containing_block_for_children,
);
let block_size =
size.auto_is(|| independent_layout.content_block_size.into());
let block_size = size.auto_is(|| independent_layout.content_block_size);
Result {
content_size: LogicalVec2 {
inline: inline_size,
block: block_size,
block: block_size.into(),
},
fragments: independent_layout.fragments,
}
};
let mut result = try_layout(block_axis.size);
let mut result = try_layout(block_axis.size.map(|t| t.into()));
// If the tentative used block size is greater than ‘max-block-size’,
// recalculate the block size and margins with ‘max-block-size’ as the
@ -645,7 +647,7 @@ impl HoistedAbsolutelyPositionedBox {
if result.content_size.block > max {
block_axis = block_axis_solver
.solve_for_size(LengthOrAuto::LengthPercentage(max));
result = try_layout(LengthOrAuto::LengthPercentage(max));
result = try_layout(AuOrAuto::LengthPercentage(max.into()));
}
}
@ -657,7 +659,7 @@ impl HoistedAbsolutelyPositionedBox {
if result.content_size.block < min_size.block {
block_axis = block_axis_solver
.solve_for_size(LengthOrAuto::LengthPercentage(min_size.block));
result = try_layout(LengthOrAuto::LengthPercentage(min_size.block));
result = try_layout(AuOrAuto::LengthPercentage(min_size.block.into()));
}
content_size = result.content_size;
@ -875,12 +877,12 @@ pub(crate) fn relative_adjustement(
// positioned, the value computes to 'auto'.""
// https://www.w3.org/TR/CSS2/visudet.html#the-height-property
let cbis = containing_block.inline_size;
let cbbs = containing_block.block_size.auto_is(Length::zero);
let cbbs = containing_block.block_size.auto_is(Au::zero);
let box_offsets = style
.box_offsets(containing_block)
.map_inline_and_block_axes(
|v| v.percentage_relative_to(cbis),
|v| v.percentage_relative_to(cbbs),
|v| v.percentage_relative_to(cbis.into()),
|v| v.percentage_relative_to(cbbs.into()),
);
fn adjust(start: LengthOrAuto, end: LengthOrAuto) -> Length {
match (start, end) {