Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Let LengthPercentage::maybe_to_used_value() accept Option<Au> (#33450)

Browse source 
Bump Stylo to servo/stylo#75 and remove conversions that are no longer
necessary.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2024-09-16 10:08:54 +02:00 • committed by GitHub
parent 9f2306f760
commit 17f796dfc1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 26 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Cargo.lock generated
View file

@ -1298,7 +1298,7 @@ dependencies = [
[[package]] [[package]]
name = "derive_common" name = "derive_common"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-09-02#89bbdff5ad80cf0a9814a7102379b5eeca89363e" source = "git+https://github.com/servo/stylo?branch=2024-09-02#6059306e6c2cbd8c76473b545bfbfd2be4062de4"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@ -1486,7 +1486,7 @@ dependencies = [
[[package]] [[package]]
name = "dom" name = "dom"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-09-02#89bbdff5ad80cf0a9814a7102379b5eeca89363e" source = "git+https://github.com/servo/stylo?branch=2024-09-02#6059306e6c2cbd8c76473b545bfbfd2be4062de4"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
] ]
@ -4118,7 +4118,7 @@ dependencies = [
[[package]] [[package]]
name = "malloc_size_of" name = "malloc_size_of"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-09-02#89bbdff5ad80cf0a9814a7102379b5eeca89363e" source = "git+https://github.com/servo/stylo?branch=2024-09-02#6059306e6c2cbd8c76473b545bfbfd2be4062de4"
dependencies = [ dependencies = [
"accountable-refcell", "accountable-refcell",
"app_units", "app_units",
@ -5911,7 +5911,7 @@ dependencies = [
[[package]] [[package]]
name = "selectors" name = "selectors"
version = "0.24.0" version = "0.24.0"
source = "git+https://github.com/servo/stylo?branch=2024-09-02#89bbdff5ad80cf0a9814a7102379b5eeca89363e" source = "git+https://github.com/servo/stylo?branch=2024-09-02#6059306e6c2cbd8c76473b545bfbfd2be4062de4"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"cssparser", "cssparser",
@ -6199,7 +6199,7 @@ dependencies = [
[[package]] [[package]]
name = "servo_arc" name = "servo_arc"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/servo/stylo?branch=2024-09-02#89bbdff5ad80cf0a9814a7102379b5eeca89363e" source = "git+https://github.com/servo/stylo?branch=2024-09-02#6059306e6c2cbd8c76473b545bfbfd2be4062de4"
dependencies = [ dependencies = [
"serde", "serde",
"stable_deref_trait", "stable_deref_trait",
@ -6208,7 +6208,7 @@ dependencies = [
[[package]] [[package]]
name = "servo_atoms" name = "servo_atoms"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-09-02#89bbdff5ad80cf0a9814a7102379b5eeca89363e" source = "git+https://github.com/servo/stylo?branch=2024-09-02#6059306e6c2cbd8c76473b545bfbfd2be4062de4"
dependencies = [ dependencies = [
"string_cache", "string_cache",
"string_cache_codegen", "string_cache_codegen",
@ -6426,7 +6426,7 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
[[package]] [[package]]
name = "size_of_test" name = "size_of_test"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-09-02#89bbdff5ad80cf0a9814a7102379b5eeca89363e" source = "git+https://github.com/servo/stylo?branch=2024-09-02#6059306e6c2cbd8c76473b545bfbfd2be4062de4"
dependencies = [ dependencies = [
"static_assertions", "static_assertions",
] ]
@ -6567,7 +6567,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]] [[package]]
name = "static_prefs" name = "static_prefs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2024-09-02#89bbdff5ad80cf0a9814a7102379b5eeca89363e" source = "git+https://github.com/servo/stylo?branch=2024-09-02#6059306e6c2cbd8c76473b545bfbfd2be4062de4"
[[package]] [[package]]
name = "strck" name = "strck"
@ -6620,7 +6620,7 @@ dependencies = [
[[package]] [[package]]
name = "style" name = "style"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-09-02#89bbdff5ad80cf0a9814a7102379b5eeca89363e" source = "git+https://github.com/servo/stylo?branch=2024-09-02#6059306e6c2cbd8c76473b545bfbfd2be4062de4"
dependencies = [ dependencies = [
"app_units", "app_units",
"arrayvec", "arrayvec",
@ -6678,7 +6678,7 @@ dependencies = [
[[package]] [[package]]
name = "style_config" name = "style_config"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-09-02#89bbdff5ad80cf0a9814a7102379b5eeca89363e" source = "git+https://github.com/servo/stylo?branch=2024-09-02#6059306e6c2cbd8c76473b545bfbfd2be4062de4"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
] ]
@ -6686,7 +6686,7 @@ dependencies = [
[[package]] [[package]]
name = "style_derive" name = "style_derive"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-09-02#89bbdff5ad80cf0a9814a7102379b5eeca89363e" source = "git+https://github.com/servo/stylo?branch=2024-09-02#6059306e6c2cbd8c76473b545bfbfd2be4062de4"
dependencies = [ dependencies = [
"darling", "darling",
"derive_common", "derive_common",
@ -6717,7 +6717,7 @@ dependencies = [
[[package]] [[package]]
name = "style_traits" name = "style_traits"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-09-02#89bbdff5ad80cf0a9814a7102379b5eeca89363e" source = "git+https://github.com/servo/stylo?branch=2024-09-02#6059306e6c2cbd8c76473b545bfbfd2be4062de4"
dependencies = [ dependencies = [
"app_units", "app_units",
"bitflags 2.6.0", "bitflags 2.6.0",
@ -7084,7 +7084,7 @@ dependencies = [
[[package]] [[package]]
name = "to_shmem" name = "to_shmem"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-09-02#89bbdff5ad80cf0a9814a7102379b5eeca89363e" source = "git+https://github.com/servo/stylo?branch=2024-09-02#6059306e6c2cbd8c76473b545bfbfd2be4062de4"
dependencies = [ dependencies = [
"cssparser", "cssparser",
"servo_arc", "servo_arc",
@ -7097,7 +7097,7 @@ dependencies = [
[[package]] [[package]]
name = "to_shmem_derive" name = "to_shmem_derive"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-09-02#89bbdff5ad80cf0a9814a7102379b5eeca89363e" source = "git+https://github.com/servo/stylo?branch=2024-09-02#6059306e6c2cbd8c76473b545bfbfd2be4062de4"
dependencies = [ dependencies = [
"darling", "darling",
"derive_common", "derive_common",

2
components/layout/model.rs
View file

@ -525,7 +525,7 @@ pub fn style_length(style_length: &Size, container_size: Option<Au>) -> MaybeAut
match style_length { match style_length {
Size::Auto => MaybeAuto::Auto, Size::Auto => MaybeAuto::Auto,
Size::LengthPercentage(ref lp) => { Size::LengthPercentage(ref lp) => {
MaybeAuto::from_option(lp.0.maybe_to_used_value(container_size.map(|l| l.into()))) MaybeAuto::from_option(lp.0.maybe_to_used_value(container_size))
}, },
} }
} }

28
components/layout_2020/geom.rs
View file

@ -146,13 +146,12 @@ impl LogicalVec2<LengthPercentageOrAuto<'_>> {
.inline .inline
.map(|value| value.to_used_value(containing_block.inline_size)), .map(|value| value.to_used_value(containing_block.inline_size)),
block: { block: {
let containing_block_block_size =
containing_block.block_size.non_auto().map(Into::into);
self.block self.block
.non_auto() .non_auto()
.and_then(|value| value.maybe_to_used_value(containing_block_block_size)) .and_then(|value| {
.map(AuOrAuto::LengthPercentage) value.maybe_to_used_value(containing_block.block_size.non_auto())
.unwrap_or(AuOrAuto::Auto) })
.map_or(AuOrAuto::Auto, AuOrAuto::LengthPercentage)
}, },
} }
} }
@ -175,20 +174,17 @@ impl LogicalVec2<LengthPercentageOrAuto<'_>> {
&self, &self,
basis: &LogicalVec2<Option<Au>>, basis: &LogicalVec2<Option<Au>>,
) -> LogicalVec2<AuOrAuto> { ) -> LogicalVec2<AuOrAuto> {
let basis = basis.map(|value| value.map(Into::into));
LogicalVec2 { LogicalVec2 {
inline: self inline: self
.inline .inline
.non_auto() .non_auto()
.and_then(|value| value.maybe_to_used_value(basis.inline)) .and_then(|value| value.maybe_to_used_value(basis.inline))
.map(AuOrAuto::LengthPercentage) .map_or(AuOrAuto::Auto, AuOrAuto::LengthPercentage),
.unwrap_or(AuOrAuto::Auto),
block: self block: self
.block .block
.non_auto() .non_auto()
.and_then(|value| value.maybe_to_used_value(basis.block)) .and_then(|value| value.maybe_to_used_value(basis.block))
.map(AuOrAuto::LengthPercentage) .map_or(AuOrAuto::Auto, AuOrAuto::LengthPercentage),
.unwrap_or(AuOrAuto::Auto),
} }
} }
} }
@ -202,9 +198,9 @@ impl LogicalVec2<Option<&'_ LengthPercentage>> {
inline: self inline: self
.inline .inline
.map(|lp| lp.to_used_value(containing_block.inline_size)), .map(|lp| lp.to_used_value(containing_block.inline_size)),
block: self.block.and_then(|lp| { block: self
lp.maybe_to_used_value(containing_block.block_size.map(Into::into).non_auto()) .block
}), .and_then(|lp| lp.maybe_to_used_value(containing_block.block_size.non_auto())),
} }
} }
} }
@ -217,10 +213,8 @@ impl LogicalVec2<Option<&'_ LengthPercentage>> {
LogicalVec2 { LogicalVec2 {
inline: self inline: self
.inline .inline
.and_then(|v| v.maybe_to_used_value(basis.inline.map(Into::into))), .and_then(|v| v.maybe_to_used_value(basis.inline)),
block: self block: self.block.and_then(|v| v.maybe_to_used_value(basis.block)),
.block
.and_then(|v| v.maybe_to_used_value(basis.block.map(Into::into))),
} }
} }
} }