Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1918875 - Let LengthPercentage::maybe_to_used_value() accept Option<Au>. r=emilio

Browse Source 
Given that `LengthPercentage::to_used_value()` accepts an `Au`, and
`NonNegativeLengthPercentage::maybe_to_used_value()` an `Option<Au>`,
it didn't make much sense for `LengthPercentage::maybe_to_used_value()`
to accept an `Option<Length>`.

All callers from Servo and Stylo have an `Option<Au>` that they needed
to convert into `Option<Length>` in order to call this function. Gecko
doesn't call it.

Differential Revision: https://phabricator.services.mozilla.com/D222210
This commit is contained in:
Oriol Brufau 2024-09-20 23:32:44 +00:00
parent ad3d33bde7
commit 304187442e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servo/components/style/values/computed/length_percentage.rs
View File

@ -518,8 +518,8 @@ impl LengthPercentage {
/// Convert the computed value into used value.
#[inline]
pub fn maybe_to_used_value(&self, container_len: Option<Length>) -> Option<Au> {
self.maybe_percentage_relative_to(container_len)
pub fn maybe_to_used_value(&self, container_len: Option<Au>) -> Option<Au> {
self.maybe_percentage_relative_to(container_len.map(Length::from))
.map(Au::from)
}
@ -1120,9 +1120,7 @@ impl NonNegativeLengthPercentage {
/// Convert the computed value into used value.
#[inline]
pub fn maybe_to_used_value(&self, containing_length: Option<Au>) -> Option<Au> {
let resolved = self
.0
.maybe_to_used_value(containing_length.map(|v| v.into()))?;
let resolved = self.0.maybe_to_used_value(containing_length)?;
Some(std::cmp::max(resolved, Au(0)))
}
}