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

Remove inline/block_size from AbsolutelyPositionedFragment

Browse source
This commit is contained in:
Simon Sapin 2019-12-07 23:32:15 +01:00
parent 80b2b5fb5e
commit f43dc3afcb
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/layout_2020/positioned.rs
View file

@ -31,10 +31,7 @@ pub(crate) struct AbsolutelyPositionedFragment<'box_> {
pub(crate) tree_rank: usize, pub(crate) tree_rank: usize,
pub(crate) inline_start: AbsoluteBoxOffsets<LengthPercentage>, pub(crate) inline_start: AbsoluteBoxOffsets<LengthPercentage>,
inline_size: LengthPercentageOrAuto,
pub(crate) block_start: AbsoluteBoxOffsets<LengthPercentage>, pub(crate) block_start: AbsoluteBoxOffsets<LengthPercentage>,
block_size: LengthPercentageOrAuto,
} }
#[derive(Clone, Copy, Debug)] #[derive(Clone, Copy, Debug)]
@ -79,10 +76,6 @@ impl AbsolutelyPositionedBox {
) -> AbsolutelyPositionedFragment { ) -> AbsolutelyPositionedFragment {
let style = &self.contents.style; let style = &self.contents.style;
let box_offsets = style.box_offsets(); let box_offsets = style.box_offsets();
let box_size = style.box_size();
let inline_size = box_size.inline;
let block_size = box_size.block;
fn absolute_box_offsets( fn absolute_box_offsets(
initial_static_start: Length, initial_static_start: Length,
@ -114,9 +107,7 @@ impl AbsolutelyPositionedBox {
absolutely_positioned_box: self, absolutely_positioned_box: self,
tree_rank, tree_rank,
inline_start, inline_start,
inline_size,
block_start, block_start,
block_size,
} }
} }
} }
@ -162,6 +153,7 @@ impl<'a> AbsolutelyPositionedFragment<'a> {
let cbis = containing_block.size.inline; let cbis = containing_block.size.inline;
let cbbs = containing_block.size.block; let cbbs = containing_block.size.block;
let box_size = style.box_size();
let padding = style.padding().percentages_relative_to(cbis); let padding = style.padding().percentages_relative_to(cbis);
let border = style.border_width(); let border = style.border_width();
let computed_margin = style.margin().percentages_relative_to(cbis); let computed_margin = style.margin().percentages_relative_to(cbis);
@ -260,7 +252,7 @@ impl<'a> AbsolutelyPositionedFragment<'a> {
} }
}, },
self.inline_start, self.inline_start,
self.inline_size, box_size.inline,
); );
let (block_anchor, block_size, margin_block_start, margin_block_end) = solve_axis( let (block_anchor, block_size, margin_block_start, margin_block_end) = solve_axis(
@ -270,7 +262,7 @@ impl<'a> AbsolutelyPositionedFragment<'a> {
computed_margin.block_end, computed_margin.block_end,
|margins| (margins / 2., margins / 2.), |margins| (margins / 2., margins / 2.),
self.block_start, self.block_start,
self.block_size, box_size.block,
); );
let margin = Sides { let margin = Sides {