Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 1f01bcc97a8691e93438864747e11ea24c4dae86
https://github.com/WebKit/WebKit/commit/1f01bcc97a8691e93438864747e11ea24c4dae86
Author: Alan Baradlay <[email protected]>
Date: 2026-07-18 (Sat, 18 Jul 2026)
Changed paths:
M Source/WebCore/rendering/RenderFlexLayout.cpp
M Source/WebCore/rendering/RenderFlexLayout.h
M Source/WebCore/rendering/RenderFlexibleBox.cpp
M Source/WebCore/rendering/RenderFlexibleBox.h
Log Message:
-----------
[cleanup] Return the flex container's used block extents from
updateFlexContainerLogicalHeight instead of reading them back
https://bugs.webkit.org/show_bug.cgi?id=318688
Reviewed by Antti Koivisto.
After updateFlexContainerLogicalHeight finalized the container's logical
height, three column-flow sites read
it back off the container:
distributeMainAxisFreeSpaceForMultilineColumnIfNeeded and the column-reverse
repositioning read contentBoxLogicalHeight(), and the reverse pass also read
logicalHeight() for the main-axis
end. These run after the finalize, so the value is already computed; FlexLayout
should take it as a value, not
consult the container.
Extend the finalize's return (renamed FlexContainerCrossExtents to
FlexContainerUsedExtents) with the used
block-axis extents (contentBoxLogicalHeight and logicalHeight) alongside the
cross-axis ones it already
returned, and thread those into distribute and
reverseColumnLinesFromContainerMainEndIfNeeded as parameters.
No change in behavior: nothing grows the container's logical height between the
finalize and these consumers
(distribute only re-resolves short multi-line-column lines up to the container
main, never past it), so each
threaded value equals what the live read returned.
* Source/WebCore/rendering/RenderFlexLayout.cpp:
* Source/WebCore/rendering/RenderFlexLayout.h:
* Source/WebCore/rendering/RenderFlexibleBox.cpp:
(RenderFlexibleBox::updateFlexContainerLogicalHeight):
* Source/WebCore/rendering/RenderFlexibleBox.h:
Canonical link: https://commits.webkit.org/317483@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications