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

Use LazyCells instead of callbacks when resolving size keywords (#34211)

Browse source 
In most cases we already had a LazyCell anyways, since we could need the
value for multiple properties. Instead of passing a callback that forces
the evaluation of the LazyCell, it's simpler to just pass the LazyCell
directly.

Also, this way we no longer need mutable references.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2024-11-11 17:26:20 +01:00 • committed by GitHub
parent 5423e622ed
commit 6a62d52cbb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 75 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/layout_2020/geom.rs
View file

@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use std::cell::LazyCell;
use std::convert::From;
use std::fmt;
use std::ops::{Add, AddAssign, Neg, Sub, SubAssign};
@ -798,17 +799,17 @@ impl LogicalVec2<Size<LengthPercentage>> {
impl Size<Au> {
/// Resolves any size into a numerical value.
#[inline]
pub(crate) fn resolve(
pub(crate) fn resolve<F: FnOnce() -> ContentSizes>(
&self,
initial_behavior: Self,
stretch_size: Au,
get_content_size: &mut impl FnMut() -> ContentSizes,
content_size: &LazyCell<ContentSizes, F>,
) -> Au {
if self.is_initial() {
assert!(!initial_behavior.is_initial());
initial_behavior.resolve_non_initial(stretch_size, get_content_size)
initial_behavior.resolve_non_initial(stretch_size, content_size)
} else {
self.resolve_non_initial(stretch_size, get_content_size)
self.resolve_non_initial(stretch_size, content_size)
}
.unwrap()
}
@ -816,16 +817,16 @@ impl Size<Au> {
/// Resolves a non-initial size into a numerical value.
/// Returns `None` if the size is the initial one.
#[inline]
pub(crate) fn resolve_non_initial(
pub(crate) fn resolve_non_initial<F: FnOnce() -> ContentSizes>(
&self,
stretch_size: Au,
get_content_size: &mut impl FnMut() -> ContentSizes,
content_size: &LazyCell<ContentSizes, F>,
) -> Option<Au> {
match self {
Self::Initial => None,
Self::MinContent => Some(get_content_size().min_content),
Self::MaxContent => Some(get_content_size().max_content),
Self::FitContent => Some(get_content_size().shrink_to_fit(stretch_size)),
Self::MinContent => Some(content_size.min_content),
Self::MaxContent => Some(content_size.max_content),
Self::FitContent => Some(content_size.shrink_to_fit(stretch_size)),
Self::Stretch => Some(stretch_size),
Self::Numeric(numeric) => Some(*numeric),
}