Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 7067b785e06bf4d2942b1d3612a628b5525cc0ab
https://github.com/WebKit/WebKit/commit/7067b785e06bf4d2942b1d3612a628b5525cc0ab
Author: Alan Baradlay <[email protected]>
Date: 2026-07-16 (Thu, 16 Jul 2026)
Changed paths:
M Source/WebCore/rendering/RenderFlexLayout.cpp
M Source/WebCore/rendering/RenderFlexibleBox.cpp
M Source/WebCore/rendering/RenderFlexibleBox.h
Log Message:
-----------
[cleanup] Move flex line positioning out of content sizing and pass the row
content height as an optional
https://bugs.webkit.org/show_bug.cgi?id=318628
Reviewed by Antti Koivisto.
performContentSizing ended by walking the flex lines to record each line's
cross-axis position and
accumulate the row container's content height. That walk is line placement, not
the 9.3-9.4 content
sizing the lambda is named for, and the height it produced was held in a
flexContainerLogicalHeight
local passed unconditionally to updateLogicalHeightForFlexContent even though
only row flow uses it
(the callee re-derived isColumnFlow to decide whether to apply it).
Hoist that loop to a plain block between performContentSizing and
performContentAlignment, next to the
work that consumes it. Rename the accumulated height to
contentLogicalHeightForRowFlow and make it a
std::optional engaged only for row flow, so column never seeds it.
updateLogicalHeightForFlexContent
now takes that optional and applies it when present rather than re-checking the
flow, matching how the
inter-line gap total (0 for column) and the empty-line minimum (already
optional) are handled.
No change in behavior: the loop runs at the same point (nothing executes
between the old and new
spots), and the height is still set for row flow and skipped for column flow.
* Source/WebCore/rendering/RenderFlexLayout.cpp:
* Source/WebCore/rendering/RenderFlexibleBox.cpp:
* Source/WebCore/rendering/RenderFlexibleBox.h:
Canonical link: https://commits.webkit.org/317358@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
