Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: b879d6574874b73a70fe336abe74eeb43c3a60da
https://github.com/WebKit/WebKit/commit/b879d6574874b73a70fe336abe74eeb43c3a60da
Author: Yulun Wu <[email protected]>
Date: 2026-04-14 (Tue, 14 Apr 2026)
Changed paths:
M Source/WebCore/rendering/RenderBlockFlow.cpp
Log Message:
-----------
[Refactor] RenderBlockFlow::collapseMargins.
https://bugs.webkit.org/show_bug.cgi?id=311036
<rdar://173604133>
Reviewed by Alan Baradlay.
This PR updates:
logicalTop -> logicalTopBeforeMarginCollapse
beforeCollapseLogicalTop -> logicalTopBeforeMarginCollapse
This makes it easier to determine the difference between the logical tops
that are tracked throughout the function.
This PR also updates:
logicalTopIntrudesIntoFloat -> marginCollapseMovedParentRendererUp
addIntrudingFloatsFromPreviousBlocks ->
handleIntrudingFloatsFromPreviousSiblings
This change clarifies the meaning of these variables, as the condition
logicalTopAfterMarginCollapse < logicalTopBeforeMarginCollapse does not
guarantee there is an intruding float we need to handle, but instead
that we should check and handle them if needed.
No behavior change.
* Source/WebCore/rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::collapseMargins):
Canonical link: https://commits.webkit.org/311209@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
