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

Layout 2020 skeleton for display: flex, behind a pref

Browse source
This commit is contained in:
Simon Sapin 2020-06-02 13:15:48 +02:00
parent d4f1f4641d
commit 64124f7a5e
8 changed files with 114 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/layout_2020/formatting_contexts.rs
View file

@ -4,6 +4,7 @@
use crate::context::LayoutContext;
use crate::dom_traversal::{Contents, NodeExt};
use crate::flexbox::FlexContainer;
use crate::flow::BlockFormattingContext;
use crate::fragments::Fragment;
use crate::positioned::PositioningContext;
@ -43,6 +44,7 @@ pub(crate) struct IndependentLayout {
#[derive(Debug, Serialize)]
enum IndependentFormattingContextContents {
Flow(BlockFormattingContext),
Flex(FlexContainer),
// Not called FC in specs, but behaves close enough
Replaced(ReplacedContent),
@ -53,6 +55,7 @@ pub(crate) struct NonReplacedIFC<'a>(NonReplacedIFCKind<'a>);
enum NonReplacedIFCKind<'a> {
Flow(&'a BlockFormattingContext),
Flex(&'a FlexContainer),
}
impl IndependentFormattingContext {
@ -83,6 +86,22 @@ impl IndependentFormattingContext {
contents: IndependentFormattingContextContents::Flow(bfc),
}
},
DisplayInside::Flex => {
let (fc, content_sizes) = FlexContainer::construct(
context,
node,
&style,
non_replaced,
content_sizes,
propagated_text_decoration_line,
);
Self {
tag: node.as_opaque(),
style,
content_sizes,
contents: IndependentFormattingContextContents::Flex(fc),
}
},
},
Err(replaced) => {
let content_sizes = content_sizes.compute(|| replaced.inline_content_sizes(&style));
@ -103,6 +122,7 @@ impl IndependentFormattingContext {
match &self.contents {
Contents::Replaced(r) => Ok(r),
Contents::Flow(f) => Err(NR(Kind::Flow(f))),
Contents::Flex(f) => Err(NR(Kind::Flex(f))),
}
}
}
@ -122,6 +142,12 @@ impl NonReplacedIFC<'_> {
containing_block,
tree_rank,
),
NonReplacedIFCKind::Flex(fc) => fc.layout(
layout_context,
positioning_context,
containing_block,
tree_rank,
),
}
}
}