mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +01:00
Upgrade Stylo to 2024-10-04 (#33767)
* 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:
parent
65c866285f
commit
c75f6627ba
16 changed files with 156 additions and 121 deletions
|
@ -962,8 +962,8 @@ impl Fragment {
|
|||
QuantitiesIncludedInIntrinsicInlineSizes::INTRINSIC_INLINE_SIZE_INCLUDES_MARGINS,
|
||||
) {
|
||||
let margin = style.logical_margin();
|
||||
MaybeAuto::from_style(margin.inline_start, Au(0)).specified_or_zero() +
|
||||
MaybeAuto::from_style(margin.inline_end, Au(0)).specified_or_zero()
|
||||
MaybeAuto::from_margin(margin.inline_start, Au(0)).specified_or_zero() +
|
||||
MaybeAuto::from_margin(margin.inline_end, Au(0)).specified_or_zero()
|
||||
} else {
|
||||
Au(0)
|
||||
};
|
||||
|
@ -1274,10 +1274,10 @@ impl Fragment {
|
|||
let logical_padding = self.style.logical_padding();
|
||||
let border_width = self.border_width();
|
||||
SpeculatedInlineContentEdgeOffsets {
|
||||
start: MaybeAuto::from_style(logical_margin.inline_start, Au(0)).specified_or_zero() +
|
||||
start: MaybeAuto::from_margin(logical_margin.inline_start, Au(0)).specified_or_zero() +
|
||||
logical_padding.inline_start.to_used_value(Au(0)) +
|
||||
border_width.inline_start,
|
||||
end: MaybeAuto::from_style(logical_margin.inline_end, Au(0)).specified_or_zero() +
|
||||
end: MaybeAuto::from_margin(logical_margin.inline_end, Au(0)).specified_or_zero() +
|
||||
logical_padding.inline_end.to_used_value(Au(0)) +
|
||||
border_width.inline_end,
|
||||
}
|
||||
|
@ -1349,9 +1349,9 @@ impl Fragment {
|
|||
let (inline_start, inline_end) = {
|
||||
let margin = self.style().logical_margin();
|
||||
(
|
||||
MaybeAuto::from_style(margin.inline_start, containing_block_inline_size)
|
||||
MaybeAuto::from_margin(margin.inline_start, containing_block_inline_size)
|
||||
.specified_or_zero(),
|
||||
MaybeAuto::from_style(margin.inline_end, containing_block_inline_size)
|
||||
MaybeAuto::from_margin(margin.inline_end, containing_block_inline_size)
|
||||
.specified_or_zero(),
|
||||
)
|
||||
};
|
||||
|
@ -1369,7 +1369,7 @@ impl Fragment {
|
|||
{
|
||||
Au(0)
|
||||
} else {
|
||||
MaybeAuto::from_style(margin.inline_start, containing_block_inline_size)
|
||||
MaybeAuto::from_margin(margin.inline_start, containing_block_inline_size)
|
||||
.specified_or_zero()
|
||||
};
|
||||
let this_inline_end_margin = if !node
|
||||
|
@ -1378,7 +1378,7 @@ impl Fragment {
|
|||
{
|
||||
Au(0)
|
||||
} else {
|
||||
MaybeAuto::from_style(margin.inline_end, containing_block_inline_size)
|
||||
MaybeAuto::from_margin(margin.inline_end, containing_block_inline_size)
|
||||
.specified_or_zero()
|
||||
};
|
||||
|
||||
|
@ -1408,9 +1408,9 @@ impl Fragment {
|
|||
let (block_start, block_end) = {
|
||||
let margin = self.style().logical_margin();
|
||||
(
|
||||
MaybeAuto::from_style(margin.block_start, containing_block_inline_size)
|
||||
MaybeAuto::from_margin(margin.block_start, containing_block_inline_size)
|
||||
.specified_or_zero(),
|
||||
MaybeAuto::from_style(margin.block_end, containing_block_inline_size)
|
||||
MaybeAuto::from_margin(margin.block_end, containing_block_inline_size)
|
||||
.specified_or_zero(),
|
||||
)
|
||||
};
|
||||
|
@ -1484,16 +1484,16 @@ impl Fragment {
|
|||
fn from_style(style: &ComputedValues, container_size: &LogicalSize<Au>) -> LogicalSize<Au> {
|
||||
let offsets = style.logical_position();
|
||||
let offset_i = if !offsets.inline_start.is_auto() {
|
||||
MaybeAuto::from_style(offsets.inline_start, container_size.inline)
|
||||
MaybeAuto::from_inset(offsets.inline_start, container_size.inline)
|
||||
.specified_or_zero()
|
||||
} else {
|
||||
-MaybeAuto::from_style(offsets.inline_end, container_size.inline)
|
||||
-MaybeAuto::from_inset(offsets.inline_end, container_size.inline)
|
||||
.specified_or_zero()
|
||||
};
|
||||
let offset_b = if !offsets.block_start.is_auto() {
|
||||
MaybeAuto::from_style(offsets.block_start, container_size.block).specified_or_zero()
|
||||
let offset_b = if offsets.block_start.is_auto() {
|
||||
MaybeAuto::from_inset(offsets.block_start, container_size.block).specified_or_zero()
|
||||
} else {
|
||||
-MaybeAuto::from_style(offsets.block_end, container_size.block).specified_or_zero()
|
||||
-MaybeAuto::from_inset(offsets.block_end, container_size.block).specified_or_zero()
|
||||
};
|
||||
LogicalSize::new(style.writing_mode, offset_i, offset_b)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue