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

Move IndependentFormattingContext::as_replaced to IndependentFormattingContextContents

Browse source
This commit is contained in:
Anthony Ramine 2020-06-10 14:23:55 +02:00
parent b66dd66403
commit b53959d23d
4 changed files with 32 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -556,7 +556,7 @@ fn layout_atomic(
start_corner += &relative_adjustement(&atomic.style, ifc.containing_block)
}
let fragment = match atomic.as_replaced() {
let fragment = match atomic.contents.as_replaced() {
Ok(replaced) => {
let size =
replaced.used_size_as_if_inline_element(ifc.containing_block, &atomic.style, &pbm);

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

@ -288,24 +288,24 @@ impl BlockLevelBox {
)
},
)),
BlockLevelBox::Independent(contents) => {
BlockLevelBox::Independent(independent) => {
Fragment::Box(positioning_context.layout_maybe_position_relative_fragment(
layout_context,
containing_block,
&contents.style,
|positioning_context| match contents.as_replaced() {
&independent.style,
|positioning_context| match independent.contents.as_replaced() {
Ok(replaced) => layout_in_flow_replaced_block_level(
containing_block,
contents.tag,
&contents.style,
independent.tag,
&independent.style,
replaced,
),
Err(non_replaced) => layout_in_flow_non_replaced_block_level(
layout_context,
positioning_context,
containing_block,
contents.tag,
&contents.style,
independent.tag,
&independent.style,
NonReplacedContents::EstablishesAnIndependentFormattingContext(
non_replaced,
),