Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: f447cda155f15de0e3840c2721bd7ccf441dd3d9
https://github.com/WebKit/WebKit/commit/f447cda155f15de0e3840c2721bd7ccf441dd3d9
Author: Alan Baradlay <[email protected]>
Date: 2026-05-22 (Fri, 22 May 2026)
Changed paths:
M Source/WebCore/rendering/RelayoutScopeForScrollbarChange.cpp
M Source/WebCore/rendering/RenderBox.cpp
M Source/WebCore/rendering/RenderFlexibleBox.cpp
M Source/WebCore/rendering/RenderFlexibleBox.h
M Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
Log Message:
-----------
[cleanup] Replace "intrinsic main size" naming with spec-aligned "block axis
size" in RenderFlexibleBox
https://bugs.webkit.org/show_bug.cgi?id=315292
Reviewed by Antti Koivisto.
The flex base size resolution code in RenderFlexibleBox used "intrinsic main
size" loosely to mean "the size you have to lay out a flex item to find" -
confusing because CSS Sizing 3 reserves "intrinsic" for the min-content,
max-content, fit-content keywords. The relevant case is specifically when
main axis is the flex item's block axis (column flex or orthogonal items),
so the value is more honestly named the block-axis size.
Renamed flexItemIntrinsicMainSize, m_intrinsicSizeAlongMainAxis, the gate
flexItemHasIntrinsicMainAxisSize, and the invalidator
clearCachedMainSizeForFlexItem
to use "block axis size" vocabulary. Also dropped the compute* prefix from
flexBaseSizeForFlexItem (it returns a value, no out-param). The gate moved
from inside the function to the caller so the precondition is visible.
* Source/WebCore/rendering/RelayoutScopeForScrollbarChange.cpp:
* Source/WebCore/rendering/RenderBox.cpp:
* Source/WebCore/rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::clearCachedBlockAxisSizeForFlexItem):
(WebCore::RenderFlexibleBox::flexBaseSizeForFlexItem):
(WebCore::RenderFlexibleBox::blockAxisSizeForFlexItem):
(WebCore::RenderFlexibleBox::flexItemNeedsBlockAxisSize):
(WebCore::RenderFlexibleBox::clearCachedMainSizeForFlexItem): Deleted.
(WebCore::RenderFlexibleBox::computeFlexBaseSizeForFlexItem): Deleted.
(WebCore::RenderFlexibleBox::flexItemIntrinsicMainSize): Deleted.
(WebCore::RenderFlexibleBox::flexItemHasIntrinsicMainAxisSize): Deleted.
* Source/WebCore/rendering/RenderFlexibleBox.h:
* Source/WebCore/rendering/updating/RenderTreeBuilder.cpp:
Canonical link: https://commits.webkit.org/313726@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
