Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 4d468ecc3dce790bd1627873523f00df7bb3caa0
https://github.com/WebKit/WebKit/commit/4d468ecc3dce790bd1627873523f00df7bb3caa0
Author: Alan Baradlay <[email protected]>
Date: 2026-05-28 (Thu, 28 May 2026)
Changed paths:
M Source/WebCore/layout/integration/LayoutIntegrationBoxGeometryUpdater.cpp
M Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp
M
Source/WebCore/layout/integration/LayoutIntegrationFormattingContextLayout.cpp
M Source/WebCore/page/LocalFrameView.cpp
M Source/WebCore/rendering/FixedTableLayout.cpp
M Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp
M Source/WebCore/rendering/RenderBlock.cpp
M Source/WebCore/rendering/RenderBlockFlow.cpp
M Source/WebCore/rendering/RenderBox.cpp
M Source/WebCore/rendering/RenderBox.h
M Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp
M Source/WebCore/rendering/RenderFileUploadControl.cpp
M Source/WebCore/rendering/RenderFlexibleBox.cpp
M Source/WebCore/rendering/RenderFragmentContainer.cpp
M Source/WebCore/rendering/RenderListBox.cpp
M Source/WebCore/rendering/RenderListMarker.cpp
M Source/WebCore/rendering/RenderMarquee.cpp
M Source/WebCore/rendering/RenderMenuList.cpp
M Source/WebCore/rendering/RenderReplaced.cpp
M Source/WebCore/rendering/RenderReplica.cpp
M Source/WebCore/rendering/RenderSlider.cpp
M Source/WebCore/rendering/RenderTable.cpp
M Source/WebCore/rendering/RenderTableCell.cpp
M Source/WebCore/rendering/RenderTextControl.cpp
M Source/WebCore/rendering/RenderView.cpp
M Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp
M Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp
M Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp
M Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp
M Source/WebCore/rendering/mathml/RenderMathMLPadded.cpp
M Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp
M Source/WebCore/rendering/mathml/RenderMathMLRow.cpp
M Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp
M Source/WebCore/rendering/mathml/RenderMathMLSpace.cpp
M Source/WebCore/rendering/mathml/RenderMathMLToken.cpp
M Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp
M Source/WebKitLegacy/mac/WebView/WebFrame.mm
Log Message:
-----------
Rename m_min/maxPreferredLogicalWidth and min/maxPreferredLogicalWidth() to
m_min/maxContentLogicalWidth and min/maxContentLogicalWidth()
https://bugs.webkit.org/show_bug.cgi?id=315697
Reviewed by Antti Koivisto.
The cached values and their accessors store min-content / max-content sizes,
which is what the CSS Sizing spec calls these. "Preferred" was a leftover
WebKit term that didn't match what the values actually are.
* Source/WebCore/layout/integration/LayoutIntegrationBoxGeometryUpdater.cpp:
(WebCore::LayoutIntegration::BoxGeometryUpdater::updateLayoutBoxDimensions):
* Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp:
(WebCore::LayoutIntegration::canUseForPreferredWidthComputation):
*
Source/WebCore/layout/integration/LayoutIntegrationFormattingContextLayout.cpp:
(WebCore::LayoutIntegration::formattingContextRootLogicalWidthForType):
* Source/WebCore/page/LocalFrameView.cpp:
(WebCore::LocalFrameView::performSizeToContentAutoSize):
* Source/WebCore/rendering/FixedTableLayout.cpp:
(WebCore::FixedTableLayout::calcWidthArray):
* Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp:
(WebCore::GridTrackSizingAlgorithm::estimatedGridAreaBreadthForGridItem const):
(WebCore::GridTrackSizingAlgorithmStrategy::minContentContributionForGridItem
const):
(WebCore::GridTrackSizingAlgorithmStrategy::maxContentContributionForGridItem
const):
* Source/WebCore/rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computeIntrinsicLogicalWidthContributions):
(WebCore::RenderBlock::computeBlockIntrinsicLogicalWidths const):
(WebCore::RenderBlock::computeChildIntrinsicLogicalWidths const):
* Source/WebCore/rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths const):
* Source/WebCore/rendering/RenderBox.cpp:
(WebCore::RenderBox::minContentLogicalWidth const):
(WebCore::RenderBox::maxContentLogicalWidth const):
(WebCore::RenderBox::computeLogicalWidth const):
(WebCore::RenderBox::computeLogicalWidthUsingGeneric const):
(WebCore::RenderBox::computeIntrinsicLogicalWidthContributions):
(WebCore::RenderBox::computeOutOfFlowPositionedLogicalWidth const):
(WebCore::RenderBox::computeOutOfFlowPositionedLogicalWidthUsing const):
(WebCore::RenderBox::applyTransferredMinMaxSizesFromAspectRatio const):
(WebCore::RenderBox::minPreferredLogicalWidth const): Deleted.
(WebCore::RenderBox::maxPreferredLogicalWidth const): Deleted.
* Source/WebCore/rendering/RenderBox.h:
* Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::computeIntrinsicLogicalWidths const):
(WebCore::RenderDeprecatedFlexibleBox::computeIntrinsicLogicalWidthContributions):
(WebCore::RenderDeprecatedFlexibleBox::allowedChildFlex):
* Source/WebCore/rendering/RenderFileUploadControl.cpp:
(WebCore::RenderFileUploadControl::computeIntrinsicLogicalWidths const):
(WebCore::RenderFileUploadControl::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::computeIntrinsicLogicalWidths const):
(WebCore::RenderFlexibleBox::computeMainAxisExtentForFlexItem):
(WebCore::RenderFlexibleBox::flexBaseSizeForFlexItem):
(WebCore::RenderFlexibleBox::computeUsedNonAutoMinMainSize):
* Source/WebCore/rendering/RenderFragmentContainer.cpp:
(WebCore::RenderFragmentContainer::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/RenderListBox.cpp:
(WebCore::RenderListBox::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::layout):
(WebCore::RenderListMarker::computeIntrinsicLogicalWidthContributions):
(WebCore::RenderListMarker::updateInlineMargins):
* Source/WebCore/rendering/RenderMarquee.cpp:
(WebCore::RenderMarquee::computePosition):
* Source/WebCore/rendering/RenderMenuList.cpp:
(WebCore::RenderMenuList::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/RenderReplica.cpp:
(WebCore::RenderReplica::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/RenderSlider.cpp:
(WebCore::RenderSlider::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/RenderTable.cpp:
(WebCore::RenderTable::updateLogicalWidth):
(WebCore::RenderTable::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::computeIntrinsicLogicalWidthContributions):
(WebCore::RenderTableCell::minLogicalWidthForColumnSizing):
(WebCore::RenderTableCell::maxLogicalWidthForColumnSizing):
* Source/WebCore/rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::computeIntrinsicLogicalWidths const):
(WebCore::RenderTextControl::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/RenderView.cpp:
(WebCore::RenderView::RenderView):
(WebCore::RenderView::layout):
* Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp:
(WebCore::RenderMathMLBlock::layoutItems):
(WebCore::RenderMathMLBlock::adjustPreferredLogicalWidthsForBorderAndPadding):
(WebCore::RenderMathMLBlock::applySizeToMathContent):
* Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp:
(WebCore::RenderMathMLFraction::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp:
(WebCore::RenderMathMLMenclose::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp:
(WebCore::RenderMathMLOperator::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/mathml/RenderMathMLPadded.cpp:
(WebCore::RenderMathMLPadded::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp:
(WebCore::RenderMathMLRoot::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/mathml/RenderMathMLRow.cpp:
(WebCore::RenderMathMLRow::preferredLogicalWidthOfRowItems):
(WebCore::RenderMathMLRow::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp:
(WebCore::RenderMathMLScripts::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/mathml/RenderMathMLSpace.cpp:
(WebCore::RenderMathMLSpace::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/mathml/RenderMathMLToken.cpp:
(WebCore::RenderMathMLToken::computeIntrinsicLogicalWidthContributions):
* Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp:
(WebCore::RenderMathMLUnderOver::computeIntrinsicLogicalWidthContributions):
* Source/WebKitLegacy/mac/WebView/WebFrame.mm:
(-[WebFrame renderedSizeOfNode:constrainedToWidth:]):
Canonical link: https://commits.webkit.org/314100@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
