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

Make IndependentFormattingContext an enum

Browse source
This commit is contained in:
Anthony Ramine 2020-06-15 14:40:01 +02:00
parent 07d8c28d4a
commit db80b8e3c1
6 changed files with 183 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout_2020/flexbox/construct.rs
View file

@ -204,7 +204,7 @@ where
// https://drafts.csswg.org/css-flexbox/#order-modified-document-order // https://drafts.csswg.org/css-flexbox/#order-modified-document-order
children.sort_by_key(|child| match &*child.borrow() { children.sort_by_key(|child| match &*child.borrow() {
FlexLevelBox::FlexItem(item) => item.style.clone_order(), FlexLevelBox::FlexItem(item) => item.style().clone_order(),
// “Absolutely-positioned children of a flex container are treated // “Absolutely-positioned children of a flex container are treated
// as having order: 0 for the purpose of determining their painting order // as having order: 0 for the purpose of determining their painting order

8
components/layout_2020/flow/construct.rs
View file

@ -723,7 +723,7 @@ where
max_assign_in_flow_outer_content_sizes_to.is_some() && max_assign_in_flow_outer_content_sizes_to.is_some() &&
!info.style.inline_size_is_length(), !info.style.inline_size_is_length(),
); );
let contents = IndependentFormattingContext::construct( let context = IndependentFormattingContext::construct(
context, context,
info, info,
display_inside, display_inside,
@ -733,13 +733,13 @@ where
); );
if let Some(to) = max_assign_in_flow_outer_content_sizes_to { if let Some(to) = max_assign_in_flow_outer_content_sizes_to {
to.max_assign(&sizing::outer_inline( to.max_assign(&sizing::outer_inline(
&contents.style, &context.style(),
not_actually_containing_block_writing_mode, not_actually_containing_block_writing_mode,
|| contents.content_sizes.expect_inline().clone(), || context.content_sizes(),
)) ))
} }
( (
ArcRefCell::new(BlockLevelBox::Independent(contents)), ArcRefCell::new(BlockLevelBox::Independent(context)),
ContainsFloats::No, ContainsFloats::No,
) )
}, },

52
components/layout_2020/flow/inline.rs
View file

@ -155,7 +155,7 @@ impl InlineFormattingContext {
impl Computation<'_> { impl Computation<'_> {
fn traverse(&mut self, inline_level_boxes: &[ArcRefCell<InlineLevelBox>]) { fn traverse(&mut self, inline_level_boxes: &[ArcRefCell<InlineLevelBox>]) {
for inline_level_box in inline_level_boxes { for inline_level_box in inline_level_boxes {
match &*inline_level_box.borrow() { match &mut *inline_level_box.borrow_mut() {
InlineLevelBox::InlineBox(inline_box) => { InlineLevelBox::InlineBox(inline_box) => {
let padding = let padding =
inline_box.style.padding(self.containing_block_writing_mode); inline_box.style.padding(self.containing_block_writing_mode);
@ -201,9 +201,9 @@ impl InlineFormattingContext {
}, },
InlineLevelBox::Atomic(atomic) => { InlineLevelBox::Atomic(atomic) => {
let (outer, pc) = sizing::outer_inline_and_percentages( let (outer, pc) = sizing::outer_inline_and_percentages(
&atomic.style, &atomic.style(),
self.containing_block_writing_mode, self.containing_block_writing_mode,
|| atomic.content_sizes.expect_inline().clone(), || atomic.content_sizes(),
); );
self.current_line.min_content += outer.min_content; self.current_line.min_content += outer.min_content;
self.current_line.max_content += outer.max_content; self.current_line.max_content += outer.max_content;
@ -295,7 +295,7 @@ impl InlineFormattingContext {
InlineLevelBox::TextRun(run) => run.layout(layout_context, &mut ifc), InlineLevelBox::TextRun(run) => run.layout(layout_context, &mut ifc),
InlineLevelBox::Atomic(a) => layout_atomic(layout_context, &mut ifc, a), InlineLevelBox::Atomic(a) => layout_atomic(layout_context, &mut ifc, a),
InlineLevelBox::OutOfFlowAbsolutelyPositionedBox(box_) => { InlineLevelBox::OutOfFlowAbsolutelyPositionedBox(box_) => {
let style = AtomicRef::map(box_.borrow(), |box_| &box_.context.style); let style = AtomicRef::map(box_.borrow(), |box_| box_.context.style());
let initial_start_corner = let initial_start_corner =
match Display::from(style.get_box().original_display) { match Display::from(style.get_box().original_display) {
Display::GeneratingBox(DisplayGeneratingBox::OutsideInside { Display::GeneratingBox(DisplayGeneratingBox::OutsideInside {
@ -545,7 +545,8 @@ fn layout_atomic(
ifc: &mut InlineFormattingContextState, ifc: &mut InlineFormattingContextState,
atomic: &mut IndependentFormattingContext, atomic: &mut IndependentFormattingContext,
) { ) {
let pbm = atomic.style.padding_border_margin(&ifc.containing_block); let style = atomic.style();
let pbm = style.padding_border_margin(&ifc.containing_block);
let margin = pbm.margin.auto_is(Length::zero); let margin = pbm.margin.auto_is(Length::zero);
let pbm_sums = &(&pbm.padding + &pbm.border) + &margin; let pbm_sums = &(&pbm.padding + &pbm.border) + &margin;
ifc.inline_position += pbm_sums.inline_start; ifc.inline_position += pbm_sums.inline_start;
@ -553,19 +554,24 @@ fn layout_atomic(
block: pbm_sums.block_start, block: pbm_sums.block_start,
inline: ifc.inline_position - ifc.current_nesting_level.inline_start, inline: ifc.inline_position - ifc.current_nesting_level.inline_start,
}; };
if atomic.style.clone_position().is_relative() { if style.clone_position().is_relative() {
start_corner += &relative_adjustement(&atomic.style, ifc.containing_block) start_corner += &relative_adjustement(&style, ifc.containing_block)
} }
let fragment = match atomic.contents.as_replaced() { let fragment = match atomic {
Ok(replaced) => { IndependentFormattingContext::Replaced(replaced) => {
let size = let size = replaced.contents.used_size_as_if_inline_element(
replaced.used_size_as_if_inline_element(ifc.containing_block, &atomic.style, &pbm); ifc.containing_block,
let fragments = replaced.make_fragments(&atomic.style, size.clone()); &replaced.style,
&pbm,
);
let fragments = replaced
.contents
.make_fragments(&replaced.style, size.clone());
let content_rect = Rect { start_corner, size }; let content_rect = Rect { start_corner, size };
BoxFragment::new( BoxFragment::new(
atomic.tag, replaced.tag,
atomic.style.clone(), replaced.style.clone(),
fragments, fragments,
content_rect, content_rect,
pbm.padding, pbm.padding,
@ -574,12 +580,14 @@ fn layout_atomic(
CollapsedBlockMargins::zero(), CollapsedBlockMargins::zero(),
) )
}, },
Err(non_replaced) => { IndependentFormattingContext::NonReplaced(non_replaced) => {
let box_size = atomic.style.content_box_size(&ifc.containing_block, &pbm); let box_size = non_replaced
let max_box_size = atomic .style
.content_box_size(&ifc.containing_block, &pbm);
let max_box_size = non_replaced
.style .style
.content_max_box_size(&ifc.containing_block, &pbm); .content_max_box_size(&ifc.containing_block, &pbm);
let min_box_size = atomic let min_box_size = non_replaced
.style .style
.content_min_box_size(&ifc.containing_block, &pbm) .content_min_box_size(&ifc.containing_block, &pbm)
.auto_is(Length::zero); .auto_is(Length::zero);
@ -587,7 +595,7 @@ fn layout_atomic(
// https://drafts.csswg.org/css2/visudet.html#inlineblock-width // https://drafts.csswg.org/css2/visudet.html#inlineblock-width
let tentative_inline_size = box_size.inline.auto_is(|| { let tentative_inline_size = box_size.inline.auto_is(|| {
let available_size = ifc.containing_block.inline_size - pbm_sums.inline_sum(); let available_size = ifc.containing_block.inline_size - pbm_sums.inline_sum();
atomic.content_sizes.shrink_to_fit(available_size) non_replaced.content_sizes.shrink_to_fit(available_size)
}); });
// https://drafts.csswg.org/css2/visudet.html#min-max-widths // https://drafts.csswg.org/css2/visudet.html#min-max-widths
@ -599,7 +607,7 @@ fn layout_atomic(
let containing_block_for_children = ContainingBlock { let containing_block_for_children = ContainingBlock {
inline_size, inline_size,
block_size: box_size.block, block_size: box_size.block,
style: &atomic.style, style: &non_replaced.style,
}; };
assert_eq!( assert_eq!(
ifc.containing_block.style.writing_mode, ifc.containing_block.style.writing_mode,
@ -635,8 +643,8 @@ fn layout_atomic(
}, },
}; };
BoxFragment::new( BoxFragment::new(
atomic.tag, non_replaced.tag,
atomic.style.clone(), non_replaced.style.clone(),
independent_layout.fragments, independent_layout.fragments,
content_rect, content_rect,
pbm.padding, pbm.padding,

43
components/layout_2020/flow/mod.rs
View file

@ -8,7 +8,9 @@ use crate::cell::ArcRefCell;
use crate::context::LayoutContext; use crate::context::LayoutContext;
use crate::flow::float::{FloatBox, FloatContext}; use crate::flow::float::{FloatBox, FloatContext};
use crate::flow::inline::InlineFormattingContext; use crate::flow::inline::InlineFormattingContext;
use crate::formatting_contexts::{IndependentFormattingContext, IndependentLayout, NonReplacedIFC}; use crate::formatting_contexts::{
IndependentFormattingContext, IndependentLayout, NonReplacedFormattingContext,
};
use crate::fragments::{ use crate::fragments::{
AbsoluteOrFixedPositionedFragment, AnonymousFragment, BoxFragment, CollapsedBlockMargins, AbsoluteOrFixedPositionedFragment, AnonymousFragment, BoxFragment, CollapsedBlockMargins,
CollapsedMargin, Fragment, Tag, CollapsedMargin, Fragment, Tag,
@ -288,33 +290,44 @@ impl BlockLevelBox {
) )
}, },
)), )),
BlockLevelBox::Independent(independent) => { BlockLevelBox::Independent(independent) => match independent {
IndependentFormattingContext::Replaced(replaced) => {
Fragment::Box(positioning_context.layout_maybe_position_relative_fragment( Fragment::Box(positioning_context.layout_maybe_position_relative_fragment(
layout_context, layout_context,
containing_block, containing_block,
&independent.style, &replaced.style,
|positioning_context| match independent.contents.as_replaced() { |_positioning_context| {
Ok(replaced) => layout_in_flow_replaced_block_level( layout_in_flow_replaced_block_level(
containing_block, containing_block,
independent.tag, replaced.tag,
&independent.style, &replaced.style,
replaced, &replaced.contents,
), )
Err(non_replaced) => layout_in_flow_non_replaced_block_level( },
))
},
IndependentFormattingContext::NonReplaced(non_replaced) => {
Fragment::Box(positioning_context.layout_maybe_position_relative_fragment(
layout_context,
containing_block,
&non_replaced.style,
|positioning_context| {
layout_in_flow_non_replaced_block_level(
layout_context, layout_context,
positioning_context, positioning_context,
containing_block, containing_block,
independent.tag, non_replaced.tag,
&independent.style, &non_replaced.style,
NonReplacedContents::EstablishesAnIndependentFormattingContext( NonReplacedContents::EstablishesAnIndependentFormattingContext(
non_replaced, non_replaced,
), ),
tree_rank, tree_rank,
float_context, float_context,
), )
}, },
)) ))
}, },
},
BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(box_) => { BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(box_) => {
let hoisted_box = AbsolutelyPositionedBox::to_hoisted( let hoisted_box = AbsolutelyPositionedBox::to_hoisted(
box_.clone(), box_.clone(),
@ -326,7 +339,7 @@ impl BlockLevelBox {
positioning_context.push(hoisted_box); positioning_context.push(hoisted_box);
Fragment::AbsoluteOrFixedPositioned(AbsoluteOrFixedPositionedFragment { Fragment::AbsoluteOrFixedPositioned(AbsoluteOrFixedPositionedFragment {
hoisted_fragment, hoisted_fragment,
position: box_.borrow().context.style.clone_position(), position: box_.borrow().context.style().clone_position(),
}) })
}, },
BlockLevelBox::OutOfFlowFloatBox(_box_) => { BlockLevelBox::OutOfFlowFloatBox(_box_) => {
@ -341,7 +354,7 @@ impl BlockLevelBox {
enum NonReplacedContents<'a> { enum NonReplacedContents<'a> {
SameFormattingContextBlock(&'a BlockContainer), SameFormattingContextBlock(&'a BlockContainer),
EstablishesAnIndependentFormattingContext(NonReplacedIFC<'a>), EstablishesAnIndependentFormattingContext(&'a NonReplacedFormattingContext),
} }
/// https://drafts.csswg.org/css2/visudet.html#blockwidth /// https://drafts.csswg.org/css2/visudet.html#blockwidth

128
components/layout_2020/formatting_contexts.rs
View file

@ -9,7 +9,7 @@ use crate::flow::BlockFormattingContext;
use crate::fragments::{Fragment, Tag}; use crate::fragments::{Fragment, Tag};
use crate::positioned::PositioningContext; use crate::positioned::PositioningContext;
use crate::replaced::ReplacedContent; use crate::replaced::ReplacedContent;
use crate::sizing::{BoxContentSizes, ContentSizesRequest}; use crate::sizing::{BoxContentSizes, ContentSizes, ContentSizesRequest};
use crate::style_ext::DisplayInside; use crate::style_ext::DisplayInside;
use crate::ContainingBlock; use crate::ContainingBlock;
use servo_arc::Arc; use servo_arc::Arc;
@ -20,15 +20,36 @@ use style::values::specified::text::TextDecorationLine;
/// https://drafts.csswg.org/css-display/#independent-formatting-context /// https://drafts.csswg.org/css-display/#independent-formatting-context
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
pub(crate) struct IndependentFormattingContext { pub(crate) enum IndependentFormattingContext {
NonReplaced(NonReplacedFormattingContext),
Replaced(ReplacedFormattingContext),
}
#[derive(Debug, Serialize)]
pub(crate) struct NonReplacedFormattingContext {
pub tag: Tag, pub tag: Tag,
#[serde(skip_serializing)] #[serde(skip_serializing)]
pub style: Arc<ComputedValues>, pub style: Arc<ComputedValues>,
/// If it was requested during construction /// If it was requested during construction
pub content_sizes: BoxContentSizes, pub content_sizes: BoxContentSizes,
pub contents: NonReplacedFormattingContextContents,
}
pub contents: IndependentFormattingContextContents, #[derive(Debug, Serialize)]
pub(crate) struct ReplacedFormattingContext {
pub tag: Tag,
#[serde(skip_serializing)]
pub style: Arc<ComputedValues>,
pub contents: ReplacedContent,
}
// Private so that code outside of this module cannot match variants.
// It should got through methods instead.
#[derive(Debug, Serialize)]
pub(crate) enum NonReplacedFormattingContextContents {
Flow(BlockFormattingContext),
Flex(FlexContainer),
// Other layout modes go here
} }
pub(crate) struct IndependentLayout { pub(crate) struct IndependentLayout {
@ -38,28 +59,6 @@ pub(crate) struct IndependentLayout {
pub content_block_size: Length, pub content_block_size: Length,
} }
#[derive(Debug, Serialize)]
pub(crate) struct IndependentFormattingContextContents(IndependentFormattingContextContentsKind);
// Private so that code outside of this module cannot match variants.
// It should got through methods instead.
#[derive(Debug, Serialize)]
enum IndependentFormattingContextContentsKind {
Flow(BlockFormattingContext),
Flex(FlexContainer),
// Not called FC in specs, but behaves close enough
Replaced(ReplacedContent),
// Other layout modes go here
}
pub(crate) struct NonReplacedIFC<'a>(NonReplacedIFCKind<'a>);
enum NonReplacedIFCKind<'a> {
Flow(&'a BlockFormattingContext),
Flex(&'a FlexContainer),
}
impl IndependentFormattingContext { impl IndependentFormattingContext {
pub fn construct<'dom>( pub fn construct<'dom>(
context: &LayoutContext, context: &LayoutContext,
@ -79,14 +78,12 @@ impl IndependentFormattingContext {
content_sizes, content_sizes,
propagated_text_decoration_line, propagated_text_decoration_line,
); );
Self { Self::NonReplaced(NonReplacedFormattingContext {
tag: Tag::from_node_and_style_info(info), tag: Tag::from_node_and_style_info(info),
style: Arc::clone(&info.style), style: Arc::clone(&info.style),
content_sizes, content_sizes,
contents: IndependentFormattingContextContents( contents: NonReplacedFormattingContextContents::Flow(bfc),
IndependentFormattingContextContentsKind::Flow(bfc), })
),
}
}, },
DisplayInside::Flex => { DisplayInside::Flex => {
let (fc, content_sizes) = FlexContainer::construct( let (fc, content_sizes) = FlexContainer::construct(
@ -96,28 +93,19 @@ impl IndependentFormattingContext {
content_sizes, content_sizes,
propagated_text_decoration_line, propagated_text_decoration_line,
); );
Self { Self::NonReplaced(NonReplacedFormattingContext {
tag: Tag::from_node_and_style_info(info), tag: Tag::from_node_and_style_info(info),
style: Arc::clone(&info.style), style: Arc::clone(&info.style),
content_sizes, content_sizes,
contents: IndependentFormattingContextContents( contents: NonReplacedFormattingContextContents::Flex(fc),
IndependentFormattingContextContentsKind::Flex(fc), })
),
}
}, },
}, },
Err(replaced) => { Err(contents) => Self::Replaced(ReplacedFormattingContext {
let content_sizes =
content_sizes.compute(|| replaced.inline_content_sizes(&info.style));
Self {
tag: Tag::from_node_and_style_info(info), tag: Tag::from_node_and_style_info(info),
style: Arc::clone(&info.style), style: Arc::clone(&info.style),
content_sizes, contents,
contents: IndependentFormattingContextContents( }),
IndependentFormattingContextContentsKind::Replaced(replaced),
),
}
},
} }
} }
@ -134,31 +122,37 @@ impl IndependentFormattingContext {
content_sizes, content_sizes,
propagated_text_decoration_line, propagated_text_decoration_line,
); );
Self { Self::NonReplaced(NonReplacedFormattingContext {
tag: Tag::from_node_and_style_info(info), tag: Tag::from_node_and_style_info(info),
style: Arc::clone(&info.style), style: Arc::clone(&info.style),
content_sizes, content_sizes,
contents: IndependentFormattingContextContents( contents: NonReplacedFormattingContextContents::Flow(bfc),
IndependentFormattingContextContentsKind::Flow(bfc), })
), }
pub fn style(&self) -> &Arc<ComputedValues> {
match self {
Self::NonReplaced(inner) => &inner.style,
Self::Replaced(inner) => &inner.style,
}
}
pub fn tag(&self) -> Tag {
match self {
Self::NonReplaced(inner) => inner.tag,
Self::Replaced(inner) => inner.tag,
}
}
pub fn content_sizes(&self) -> ContentSizes {
match self {
Self::NonReplaced(inner) => inner.content_sizes.expect_inline().clone(),
Self::Replaced(inner) => inner.contents.inline_content_sizes(&inner.style),
} }
} }
} }
impl IndependentFormattingContextContents { impl NonReplacedFormattingContext {
pub fn as_replaced(&self) -> Result<&ReplacedContent, NonReplacedIFC<'_>> {
use self::IndependentFormattingContextContentsKind as Contents;
use self::NonReplacedIFC as NR;
use self::NonReplacedIFCKind as Kind;
match &self.0 {
Contents::Replaced(r) => Ok(r),
Contents::Flow(f) => Err(NR(Kind::Flow(f))),
Contents::Flex(f) => Err(NR(Kind::Flex(f))),
}
}
}
impl NonReplacedIFC<'_> {
pub fn layout( pub fn layout(
&self, &self,
layout_context: &LayoutContext, layout_context: &LayoutContext,
@ -166,14 +160,14 @@ impl NonReplacedIFC<'_> {
containing_block: &ContainingBlock, containing_block: &ContainingBlock,
tree_rank: usize, tree_rank: usize,
) -> IndependentLayout { ) -> IndependentLayout {
match &self.0 { match &self.contents {
NonReplacedIFCKind::Flow(bfc) => bfc.layout( NonReplacedFormattingContextContents::Flow(bfc) => bfc.layout(
layout_context, layout_context,
positioning_context, positioning_context,
containing_block, containing_block,
tree_rank, tree_rank,
), ),
NonReplacedIFCKind::Flex(fc) => fc.layout( NonReplacedFormattingContextContents::Flex(fc) => fc.layout(
layout_context, layout_context,
positioning_context, positioning_context,
containing_block, containing_block,

81
components/layout_2020/positioned.rs
View file

@ -124,7 +124,7 @@ impl AbsolutelyPositionedBox {
let box_offsets = { let box_offsets = {
let box_ = self_.borrow(); let box_ = self_.borrow();
let box_offsets = box_.context.style.box_offsets(containing_block); let box_offsets = box_.context.style().box_offsets(containing_block);
Vec2 { Vec2 {
inline: absolute_box_offsets( inline: absolute_box_offsets(
initial_start_corner.inline, initial_start_corner.inline,
@ -268,7 +268,7 @@ impl PositioningContext {
.absolutely_positioned_box .absolutely_positioned_box
.borrow() .borrow()
.context .context
.style .style()
.clone_position(); .clone_position();
match position { match position {
Position::Fixed => {}, // fall through Position::Fixed => {}, // fall through
@ -395,29 +395,30 @@ impl HoistedAbsolutelyPositionedBox {
) -> BoxFragment { ) -> BoxFragment {
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 absolutely_positioned_box = self.absolutely_positioned_box.borrow_mut(); let mut absolutely_positioned_box = self.absolutely_positioned_box.borrow_mut();
let style = &absolutely_positioned_box.context.style; let pbm = absolutely_positioned_box
let pbm = style.padding_border_margin(&containing_block.into()); .context
.style()
.padding_border_margin(&containing_block.into());
let size; let size = match &absolutely_positioned_box.context {
let replaced_used_size; IndependentFormattingContext::Replaced(replaced) => {
match absolutely_positioned_box.context.contents.as_replaced() {
Ok(replaced) => {
// https://drafts.csswg.org/css2/visudet.html#abs-replaced-width // https://drafts.csswg.org/css2/visudet.html#abs-replaced-width
// https://drafts.csswg.org/css2/visudet.html#abs-replaced-height // https://drafts.csswg.org/css2/visudet.html#abs-replaced-height
let used_size = let used_size = replaced.contents.used_size_as_if_inline_element(
replaced.used_size_as_if_inline_element(&containing_block.into(), style, &pbm); &containing_block.into(),
size = Vec2 { &replaced.style,
&pbm,
);
Vec2 {
inline: LengthOrAuto::LengthPercentage(used_size.inline), inline: LengthOrAuto::LengthPercentage(used_size.inline),
block: LengthOrAuto::LengthPercentage(used_size.block), block: LengthOrAuto::LengthPercentage(used_size.block),
};
replaced_used_size = Some(used_size);
},
Err(_non_replaced) => {
size = style.content_box_size(&containing_block.into(), &pbm);
replaced_used_size = None;
},
} }
},
IndependentFormattingContext::NonReplaced(non_replaced) => non_replaced
.style
.content_box_size(&containing_block.into(), &pbm),
};
let inline_axis = solve_axis( let inline_axis = solve_axis(
cbis, cbis,
@ -446,19 +447,22 @@ impl HoistedAbsolutelyPositionedBox {
block_end: block_axis.margin_end, block_end: block_axis.margin_end,
}; };
let mut positioning_context = PositioningContext::new_for_style(style).unwrap(); let mut positioning_context =
PositioningContext::new_for_style(absolutely_positioned_box.context.style()).unwrap();
let mut new_fragment = { let mut new_fragment = {
let size; let content_size;
let fragments; let fragments;
match absolutely_positioned_box.context.contents.as_replaced() { match &mut absolutely_positioned_box.context {
Ok(replaced) => { IndependentFormattingContext::Replaced(replaced) => {
// https://drafts.csswg.org/css2/visudet.html#abs-replaced-width // https://drafts.csswg.org/css2/visudet.html#abs-replaced-width
// https://drafts.csswg.org/css2/visudet.html#abs-replaced-height // https://drafts.csswg.org/css2/visudet.html#abs-replaced-height
let style = &absolutely_positioned_box.context.style; let style = &replaced.style;
size = replaced_used_size.unwrap(); content_size = size.auto_is(|| unreachable!());
fragments = replaced.make_fragments(style, size.clone()); fragments = replaced
.contents
.make_fragments(style, content_size.clone());
}, },
Err(non_replaced) => { IndependentFormattingContext::NonReplaced(non_replaced) => {
// https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width // https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width
// https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-height // https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-height
let inline_size = inline_axis.size.auto_is(|| { let inline_size = inline_axis.size.auto_is(|| {
@ -468,16 +472,13 @@ impl HoistedAbsolutelyPositionedBox {
}; };
let available_size = let available_size =
cbis - anchor - pbm.padding_border_sums.inline - margin.inline_sum(); cbis - anchor - pbm.padding_border_sums.inline - margin.inline_sum();
absolutely_positioned_box non_replaced.content_sizes.shrink_to_fit(available_size)
.context
.content_sizes
.shrink_to_fit(available_size)
}); });
let containing_block_for_children = ContainingBlock { let containing_block_for_children = ContainingBlock {
inline_size, inline_size,
block_size: block_axis.size, block_size: block_axis.size,
style, style: &non_replaced.style,
}; };
// https://drafts.csswg.org/css-writing-modes/#orthogonal-flows // https://drafts.csswg.org/css-writing-modes/#orthogonal-flows
assert_eq!( assert_eq!(
@ -493,7 +494,7 @@ impl HoistedAbsolutelyPositionedBox {
dummy_tree_rank, dummy_tree_rank,
); );
size = Vec2 { content_size = Vec2 {
inline: inline_size, inline: inline_size,
block: block_axis block: block_axis
.size .size
@ -506,11 +507,15 @@ impl HoistedAbsolutelyPositionedBox {
let pb = &pbm.padding + &pbm.border; let pb = &pbm.padding + &pbm.border;
let inline_start = match inline_axis.anchor { let inline_start = match inline_axis.anchor {
Anchor::Start(start) => start + pb.inline_start + margin.inline_start, Anchor::Start(start) => start + pb.inline_start + margin.inline_start,
Anchor::End(end) => cbis - end - pb.inline_end - margin.inline_end - size.inline, Anchor::End(end) => {
cbis - end - pb.inline_end - margin.inline_end - content_size.inline
},
}; };
let block_start = match block_axis.anchor { let block_start = match block_axis.anchor {
Anchor::Start(start) => start + pb.block_start + margin.block_start, Anchor::Start(start) => start + pb.block_start + margin.block_start,
Anchor::End(end) => cbbs - end - pb.block_end - margin.block_end - size.block, Anchor::End(end) => {
cbbs - end - pb.block_end - margin.block_end - content_size.block
},
}; };
let content_rect = Rect { let content_rect = Rect {
@ -518,12 +523,12 @@ impl HoistedAbsolutelyPositionedBox {
inline: inline_start, inline: inline_start,
block: block_start, block: block_start,
}, },
size, size: content_size,
}; };
BoxFragment::new( BoxFragment::new(
absolutely_positioned_box.context.tag, absolutely_positioned_box.context.tag(),
style.clone(), absolutely_positioned_box.context.style().clone(),
fragments, fragments,
content_rect, content_rect,
pbm.padding, pbm.padding,