diff options
| author | Martin Robinson <mrobinson@igalia.com> | 2024-07-24 16:37:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-24 14:37:08 +0000 |
| commit | 569fd5d8b580b9b9e5f9746f239a24caa857b71e (patch) | |
| tree | c0fec38e8e840725681ac59de0a2c1dcaa5a7f8c /components/layout_2020 | |
| parent | 60e65c175dcc6dda08161f3a3f56510fc88ddceb (diff) | |
| download | servo-569fd5d8b580b9b9e5f9746f239a24caa857b71e.tar.gz servo-569fd5d8b580b9b9e5f9746f239a24caa857b71e.zip | |
Upgrade stylo to 2024-07-16 (#32812)
* Upgrade stylo to 2024-07-16
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
* Use the new `dom` crate from stylo
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
---------
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Co-authored-by: Oriol Brufau <obrufau@igalia.com>
Diffstat (limited to 'components/layout_2020')
| -rw-r--r-- | components/layout_2020/flow/inline/mod.rs | 6 | ||||
| -rw-r--r-- | components/layout_2020/flow/mod.rs | 10 | ||||
| -rw-r--r-- | components/layout_2020/style_ext.rs | 1 |
3 files changed, 7 insertions, 10 deletions
diff --git a/components/layout_2020/flow/inline/mod.rs b/components/layout_2020/flow/inline/mod.rs index b5f508e6f29..3c480466ff7 100644 --- a/components/layout_2020/flow/inline/mod.rs +++ b/components/layout_2020/flow/inline/mod.rs @@ -932,16 +932,16 @@ impl<'a, 'b> InlineFormattingContextState<'a, 'b> { let text_align = match text_align_keyword { TextAlignKeyword::Start => TextAlign::Start, - TextAlignKeyword::Center | TextAlignKeyword::ServoCenter => TextAlign::Center, + TextAlignKeyword::Center | TextAlignKeyword::MozCenter => TextAlign::Center, TextAlignKeyword::End => TextAlign::End, - TextAlignKeyword::Left | TextAlignKeyword::ServoLeft => { + TextAlignKeyword::Left | TextAlignKeyword::MozLeft => { if style.writing_mode.line_left_is_inline_start() { TextAlign::Start } else { TextAlign::End } }, - TextAlignKeyword::Right | TextAlignKeyword::ServoRight => { + TextAlignKeyword::Right | TextAlignKeyword::MozRight => { if style.writing_mode.line_left_is_inline_start() { TextAlign::End } else { diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs index 409313f79ac..ff99397c1a3 100644 --- a/components/layout_2020/flow/mod.rs +++ b/components/layout_2020/flow/mod.rs @@ -1478,13 +1478,9 @@ fn justify_self_alignment(containing_block: &ContainingBlock, free_space: Au) -> let style = containing_block.style; debug_assert!(free_space >= Au::zero()); match style.clone_text_align() { - TextAlignKeyword::ServoCenter => free_space / 2, - TextAlignKeyword::ServoLeft if !style.writing_mode.line_left_is_inline_start() => { - free_space - }, - TextAlignKeyword::ServoRight if style.writing_mode.line_left_is_inline_start() => { - free_space - }, + TextAlignKeyword::MozCenter => free_space / 2, + TextAlignKeyword::MozLeft if !style.writing_mode.line_left_is_inline_start() => free_space, + TextAlignKeyword::MozRight if style.writing_mode.line_left_is_inline_start() => free_space, _ => Au::zero(), } } diff --git a/components/layout_2020/style_ext.rs b/components/layout_2020/style_ext.rs index 20a89bedf28..dc3bcbf79fa 100644 --- a/components/layout_2020/style_ext.rs +++ b/components/layout_2020/style_ext.rs @@ -718,6 +718,7 @@ impl From<stylo::Display> for Display { is_list_item: packed.is_list_item(), }, stylo::DisplayInside::Flex => DisplayInside::Flex, + stylo::DisplayInside::Grid => todo!("Grid support is not yet implemented."), // These should not be values of DisplayInside, but oh well stylo::DisplayInside::None => return Display::None, |