Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-10 16:05:43 +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

21
components/layout_2020/positioned.rs
View file

@ -773,28 +773,25 @@ impl<'a> AbsoluteAxisSolver<'a> {
///
/// In the replaced case, `size` is never `Auto`.
fn solve(&self, get_content_size: Option<impl FnOnce() -> ContentSizes>) -> AxisResult {
let mut get_content_size = get_content_size.map(|get_content_size| {
// The provided `get_content_size` is a FnOnce but we may need its result multiple times.
// A LazyCell will only invoke it once if needed, and then reuse the result.
let content_size = LazyCell::new(get_content_size);
move || *content_size
});
let mut solve_size = |initial_behavior, stretch_size: Au| -> SizeConstraint {
// The provided `get_content_size` is a FnOnce but we may need its result multiple times.
// A LazyCell will only invoke it once if needed, and then reuse the result.
let content_size = get_content_size.map(LazyCell::new);
let solve_size = |initial_behavior, stretch_size: Au| -> SizeConstraint {
let initial_is_stretch = initial_behavior == Size::Stretch;
let stretch_size = stretch_size.max(Au::zero());
if let Some(mut get_content_size) = get_content_size.as_mut() {
if let Some(ref content_size) = content_size {
let preferred_size = Some(self.computed_size.resolve(
initial_behavior,
stretch_size,
&mut get_content_size,
content_size,
));
let min_size = self
.computed_min_size
.resolve_non_initial(stretch_size, &mut get_content_size)
.resolve_non_initial(stretch_size, content_size)
.unwrap_or_default();
let max_size = self
.computed_max_size
.resolve_non_initial(stretch_size, &mut get_content_size);
.resolve_non_initial(stretch_size, content_size);
SizeConstraint::new(preferred_size, min_size, max_size)
} else {
let preferred_size = self
@ -811,7 +808,7 @@ impl<'a> AbsoluteAxisSolver<'a> {
SizeConstraint::new(preferred_size, min_size, max_size)
}
};
let mut solve_for_anchor = |anchor: Anchor| {
let solve_for_anchor = |anchor: Anchor| {
let margin_start = self.computed_margin_start.auto_is(Au::zero);
let margin_end = self.computed_margin_end.auto_is(Au::zero);
let stretch_size = self.containing_size -