Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade Stylo to 2024-10-04 (#33767)

Browse source 
* Upgrade Stylo to 2024-10-04

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

* Fixup for https://phabricator.services.mozilla.com/D220285

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

* Fixup for https://bugzilla.mozilla.org/show_bug.cgi?id=1918093

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

* Fixup for https://phabricator.services.mozilla.com/D222817

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

* Fixup for https://phabricator.services.mozilla.com/D222856

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

* Fixup for https://phabricator.services.mozilla.com/D222532

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

* Fixup for https://phabricator.services.mozilla.com/D222533

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

* Fixup for https://phabricator.services.mozilla.com/D222534

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

* Fixup for https://phabricator.services.mozilla.com/D223878

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

---------

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2024-10-20 21:53:38 +02:00 • committed by GitHub
parent 65c866285f
commit c75f6627ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 156 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

34
components/layout/block.rs
View file

@ -46,7 +46,7 @@ use style::context::SharedStyleContext;
use style::logical_geometry::{LogicalMargin, LogicalPoint, LogicalRect, LogicalSize, WritingMode};
use style::properties::ComputedValues;
use style::servo::restyle_damage::ServoRestyleDamage;
use style::values::computed::{LengthPercentageOrAuto, MaxSize, Size};
use style::values::computed::{Margin, MaxSize, Size};
use crate::context::LayoutContext;
use crate::display_list::items::DisplayListSection;
@ -1408,8 +1408,8 @@ impl BlockFlow {
let (block_start, block_end) = {
let position = self.fragment.style().logical_position();
(
MaybeAuto::from_style(position.block_start, container_size),
MaybeAuto::from_style(position.block_end, container_size),
MaybeAuto::from_inset(position.block_start, container_size),
MaybeAuto::from_inset(position.block_end, container_size),
)
};
@ -1422,11 +1422,11 @@ impl BlockFlow {
// calculated during assign-inline-size.
let margin = self.fragment.style().logical_margin();
let margin_block_start = match margin.block_start {
LengthPercentageOrAuto::Auto => MaybeAuto::Auto,
Margin::Auto => MaybeAuto::Auto,
_ => MaybeAuto::Specified(self.fragment.margin.block_start),
};
let margin_block_end = match margin.block_end {
LengthPercentageOrAuto::Auto => MaybeAuto::Auto,
Margin::Auto => MaybeAuto::Auto,
_ => MaybeAuto::Specified(self.fragment.margin.block_end),
};
@ -1456,11 +1456,11 @@ impl BlockFlow {
// calculated during assign-inline-size.
let margin = self.fragment.style().logical_margin();
let margin_block_start = match margin.block_start {
LengthPercentageOrAuto::Auto => MaybeAuto::Auto,
Margin::Auto => MaybeAuto::Auto,
_ => MaybeAuto::Specified(self.fragment.margin.block_start),
};
let margin_block_end = match margin.block_end {
LengthPercentageOrAuto::Auto => MaybeAuto::Auto,
Margin::Auto => MaybeAuto::Auto,
_ => MaybeAuto::Specified(self.fragment.margin.block_end),
};
@ -1469,8 +1469,8 @@ impl BlockFlow {
{
let position = self.fragment.style().logical_position();
block_start =
MaybeAuto::from_style(position.block_start, containing_block_block_size);
block_end = MaybeAuto::from_style(position.block_end, containing_block_block_size);
MaybeAuto::from_inset(position.block_start, containing_block_block_size);
block_end = MaybeAuto::from_inset(position.block_end, containing_block_block_size);
}
let available_block_size =
@ -2117,10 +2117,10 @@ impl BlockFlow {
let offsets = self.fragment.style().logical_position();
let as_margins = LogicalMargin::new(
writing_mode,
MaybeAuto::from_style(offsets.block_start, containing_block_size.inline),
MaybeAuto::from_style(offsets.inline_end, containing_block_size.inline),
MaybeAuto::from_style(offsets.block_end, containing_block_size.inline),
MaybeAuto::from_style(offsets.inline_start, containing_block_size.inline),
MaybeAuto::from_inset(offsets.block_start, containing_block_size.inline),
MaybeAuto::from_inset(offsets.inline_end, containing_block_size.inline),
MaybeAuto::from_inset(offsets.block_end, containing_block_size.inline),
MaybeAuto::from_inset(offsets.inline_start, containing_block_size.inline),
);
as_margins.to_physical(writing_mode)
}
@ -2789,10 +2789,10 @@ pub trait ISizeAndMarginsComputer {
containing_block_inline_size - block.fragment.border_padding.inline_start_end();
ISizeConstraintInput::new(
computed_inline_size,
MaybeAuto::from_style(margin.inline_start, containing_block_inline_size),
MaybeAuto::from_style(margin.inline_end, containing_block_inline_size),
MaybeAuto::from_style(position.inline_start, containing_block_inline_size),
MaybeAuto::from_style(position.inline_end, containing_block_inline_size),
MaybeAuto::from_margin(margin.inline_start, containing_block_inline_size),
MaybeAuto::from_margin(margin.inline_end, containing_block_inline_size),
MaybeAuto::from_inset(position.inline_start, containing_block_inline_size),
MaybeAuto::from_inset(position.inline_end, containing_block_inline_size),
available_inline_size,
)
}