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

Do not use ParallelIterator if not using rayon

Browse source
This commit is contained in:
Naveen Gattu 2021-11-30 12:51:56 -08:00 • committed by GitHub
parent 6fced22e47
commit 9af545e4e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/layout_2020/flow/mod.rs
View file

@ -134,20 +134,27 @@ impl BlockContainer {
), ),
} }
} }
pub(super) fn inline_content_sizes( pub(super) fn inline_content_sizes(
&self, &self,
layout_context: &LayoutContext, layout_context: &LayoutContext,
writing_mode: WritingMode, writing_mode: WritingMode,
) -> ContentSizes { ) -> ContentSizes {
match &self { match &self {
Self::BlockLevelBoxes(boxes) => boxes Self::BlockLevelBoxes(boxes) if layout_context.use_rayon => boxes
.par_iter() .par_iter()
.map(|box_| { .map(|box_| {
box_.borrow_mut() box_.borrow_mut()
.inline_content_sizes(layout_context, writing_mode) .inline_content_sizes(layout_context, writing_mode)
}) })
.reduce(ContentSizes::zero, ContentSizes::max), .reduce(ContentSizes::zero, ContentSizes::max),
Self::BlockLevelBoxes(boxes) => boxes
.iter()
.map(|box_| {
box_.borrow_mut()
.inline_content_sizes(layout_context, writing_mode)
})
.reduce(ContentSizes::max).unwrap_or_else(ContentSizes::zero),
Self::InlineFormattingContext(context) => { Self::InlineFormattingContext(context) => {
context.inline_content_sizes(layout_context, writing_mode) context.inline_content_sizes(layout_context, writing_mode)
}, },