Layout: Continue support incremental box tree reconstruction for flex&taffy level box #37854
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loirooriol
approved these changes
Jul 3, 2025
Comment on lines
103
to
115
| if is_abspos { | ||
| return Some(ModernItem { | ||
| kind: ModernItemKind::ReusedBox(layout_box), | ||
| order: 0, | ||
| box_slot: Some(box_slot), | ||
| }); | ||
| } else { | ||
| return Some(ModernItem { | ||
| kind: ModernItemKind::ReusedBox(layout_box), | ||
| order: info.style.clone_order(), | ||
| box_slot: Some(box_slot), | ||
| }); | ||
| } |
There was a problem hiding this comment.
Seems simpler to not repeat:
Suggested change
| if is_abspos { | |
| return Some(ModernItem { | |
| kind: ModernItemKind::ReusedBox(layout_box), | |
| order: 0, | |
| box_slot: Some(box_slot), | |
| }); | |
| } else { | |
| return Some(ModernItem { | |
| kind: ModernItemKind::ReusedBox(layout_box), | |
| order: info.style.clone_order(), | |
| }); | |
| } | |
| let order = if is_abspos { | |
| 0 | |
| } else { | |
| info.style.clone_order() | |
| }; | |
| return Some(ModernItem { | |
| kind: ModernItemKind::ReusedBox(layout_box), | |
| order, | |
| box_slot: Some(box_slot), | |
| }); |
Comment on lines
134
to
146
| if is_abspos { | ||
| Some(ModernItem { | ||
| kind: ModernItemKind::OutOfFlow, | ||
| kind: ModernItemKind::OutOfFlow(formatting_context), | ||
| order: 0, | ||
| box_slot: Some(box_slot), | ||
| formatting_context, | ||
| }) | ||
| } else { | ||
| Some(ModernItem { | ||
| kind: ModernItemKind::InFlow, | ||
| kind: ModernItemKind::InFlow(formatting_context), | ||
| order: info.style.clone_order(), | ||
| box_slot: Some(box_slot), | ||
| formatting_context, | ||
| }) | ||
| } |
There was a problem hiding this comment.
Same here, while you are at it
components/layout/flexbox/mod.rs
Outdated
| ArcRefCell::new(FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(abs_pos_box)) | ||
| }, | ||
| ModernItemKind::ReusedBox(layout_box) => match layout_box { | ||
| LayoutBox::FlexLevel(flex_level_box) => flex_level_box.clone(), |
There was a problem hiding this comment.
The clone() seems unnecessary
components/layout/taffy/mod.rs
Outdated
| )) | ||
| }, | ||
| ModernItemKind::ReusedBox(layout_box) => match layout_box { | ||
| LayoutBox::TaffyItemBox(taffy_item_box) => taffy_item_box.clone(), |
There was a problem hiding this comment.
The clone() seems unnecessary
| .take_layout_box_if_undamaged(info.damage) | ||
| .and_then(|layout_box| match &layout_box { | ||
| LayoutBox::FlexLevel(_) | LayoutBox::TaffyItemBox(_) => { | ||
| return Some(layout_box); |
0d8f385 to
134d947
Compare
|
Lint still failing |
134d947 to
4b663fc
Compare
|
Still failing 😅 |
…evel box This change reuse the flex/taffy level box from old box slot if the box slot is valid and there is no LayoutDamage to the element. Signed-off-by: sharpshooter_pt <ibluegalaxy_taoj@163.com>
4b663fc to
edd0d82
Compare
I left too late last night and didn't have a computer on hand, so I had to try to make changes on my phone. As expected, I couldn't make all the changes. |
mrobinson
approved these changes
Jul 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Layout: Continue support incremental box tree reconstruction for flex&taffy level box
This change reuse the flex/taffy level box from old box slot if the box slot is valid and there is no LayoutDamage to the element.
Testing: This should not change observable behavior and is thus covered by existing WPT tests.