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/inline.rs | |
| 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/inline.rs')
| -rw-r--r-- | components/layout/inline.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 03e5fc8b01f..6d8f49d34d0 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -1035,13 +1035,13 @@ impl InlineFlow { let is_ltr = fragments.fragments[0].style().writing_mode.is_bidi_ltr(); let line_align = match (line_align, is_ltr) { (TextAlign::Left, true) | - (TextAlign::ServoLeft, true) | + (TextAlign::MozLeft, true) | (TextAlign::Right, false) | - (TextAlign::ServoRight, false) => TextAlign::Start, + (TextAlign::MozRight, false) => TextAlign::Start, (TextAlign::Left, false) | - (TextAlign::ServoLeft, false) | + (TextAlign::MozLeft, false) | (TextAlign::Right, true) | - (TextAlign::ServoRight, true) => TextAlign::End, + (TextAlign::MozRight, true) => TextAlign::End, _ => line_align, }; @@ -1053,11 +1053,11 @@ impl InlineFlow { InlineFlow::justify_inline_fragments(fragments, line, slack_inline_size) }, TextAlign::Justify | TextAlign::Start => {}, - TextAlign::Center | TextAlign::ServoCenter => { + TextAlign::Center | TextAlign::MozCenter => { inline_start_position_for_fragment += slack_inline_size.scale_by(0.5) }, TextAlign::End => inline_start_position_for_fragment += slack_inline_size, - TextAlign::Left | TextAlign::ServoLeft | TextAlign::Right | TextAlign::ServoRight => { + TextAlign::Left | TextAlign::MozLeft | TextAlign::Right | TextAlign::MozRight => { unreachable!() }, } |