Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 2aba5fa1a194e0914045b2e7242c778ad595e348
https://github.com/WebKit/WebKit/commit/2aba5fa1a194e0914045b2e7242c778ad595e348
Author: Alan Baradlay <[email protected]>
Date: 2024-07-14 (Sun, 14 Jul 2024)
Changed paths:
M Source/WebCore/rendering/FlexibleBoxAlgorithm.cpp
M Source/WebCore/rendering/FlexibleBoxAlgorithm.h
M Source/WebCore/rendering/RenderBlock.cpp
M Source/WebCore/rendering/RenderBox.cpp
M Source/WebCore/rendering/RenderBoxModelObject.cpp
M Source/WebCore/rendering/RenderFlexibleBox.cpp
M Source/WebCore/rendering/RenderFlexibleBox.h
M Source/WebCore/rendering/RenderLayerScrollableArea.cpp
M Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
Log Message:
-----------
[Flex] Rename child in RenderFlexibleBox to flexItem
https://bugs.webkit.org/show_bug.cgi?id=276579
Reviewed by Antti Koivisto.
This rename makes it easier to read/understand RenderFlexibleBox code.
- from (generic) [child/children] to [flexItem(s)]
- from (existing) [FlexItem] structure to [FlexLayoutItem]
^^ part of FlexLayoutAlgorithm.
It also helps to find flex code leaking out to generic (block) layout (in most
cases intentionally though).
* Source/WebCore/rendering/FlexibleBoxAlgorithm.cpp:
(WebCore::FlexLayoutItem::FlexLayoutItem):
(WebCore::FlexLayoutAlgorithm::FlexLayoutAlgorithm):
(WebCore::FlexLayoutAlgorithm::canFitItemWithTrimmedMarginEnd const):
(WebCore::FlexLayoutAlgorithm::removeMarginEndFromFlexSizes const):
(WebCore::FlexLayoutAlgorithm::computeNextFlexLine):
(WebCore::FlexLayoutItem::constrainSizeByMinMax const):
(WebCore::FlexItem::FlexItem): Deleted.
(WebCore::FlexItem::constrainSizeByMinMax const): Deleted.
* Source/WebCore/rendering/FlexibleBoxAlgorithm.h:
(WebCore::FlexLayoutItem::style const):
(WebCore::FlexItem::hypotheticalMainAxisMarginBoxSize const): Deleted.
(WebCore::FlexItem::flexBaseMarginBoxSize const): Deleted.
(WebCore::FlexItem::flexedMarginBoxSize const): Deleted.
* Source/WebCore/rendering/RenderBlock.cpp:
(WebCore::RenderBlock::availableLogicalHeightForPercentageComputation const):
* Source/WebCore/rendering/RenderBox.cpp:
(WebCore::RenderBox::cacheIntrinsicContentLogicalHeightForFlexItem const):
(WebCore::RenderBox::computeContentAndScrollbarLogicalHeightUsing const):
(WebCore::RenderBox::computeReplacedLogicalHeightUsing const):
(WebCore::RenderBox::availableLogicalHeightUsing const):
* Source/WebCore/rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight
const):
* Source/WebCore/rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::LineState::LineState):
(WebCore::RenderFlexibleBox::computeIntrinsicLogicalWidths const):
(WebCore::RenderFlexibleBox::computeChildIntrinsicLogicalWidths const):
(WebCore::RenderFlexibleBox::firstLineBaseline const):
(WebCore::RenderFlexibleBox::lastLineBaseline const):
(WebCore::RenderFlexibleBox::baselineFlexItem const):
(WebCore::RenderFlexibleBox::hitTestChildren):
(WebCore::RenderFlexibleBox::layoutBlock):
(WebCore::RenderFlexibleBox::appendFlexItemFrameRects):
(WebCore::RenderFlexibleBox::repaintFlexItemsDuringLayoutIfMoved):
(WebCore::RenderFlexibleBox::paintChildren):
(WebCore::RenderFlexibleBox::repositionLogicalHeightDependentFlexItems):
(WebCore::RenderFlexibleBox::mainAxisIsFlexItemInlineAxis const):
(WebCore::RenderFlexibleBox::shouldApplyMinSizeAutoForFlexItem const):
(WebCore::RenderFlexibleBox::shouldApplyMinBlockSizeAutoForFlexItem const):
(WebCore::RenderFlexibleBox::flexBasisForFlexItem const):
(WebCore::RenderFlexibleBox::crossAxisExtentForFlexItem const):
(WebCore::RenderFlexibleBox::cachedFlexItemIntrinsicContentLogicalHeight const):
(WebCore::RenderFlexibleBox::setCachedFlexItemIntrinsicContentLogicalHeight):
(WebCore::RenderFlexibleBox::clearCachedFlexItemIntrinsicContentLogicalHeight):
(WebCore::RenderFlexibleBox::flexItemIntrinsicLogicalHeight const):
(WebCore::RenderFlexibleBox::flexItemIntrinsicLogicalWidth):
(WebCore::RenderFlexibleBox::crossAxisIntrinsicExtentForFlexItem):
(WebCore::RenderFlexibleBox::mainAxisExtentForFlexItem const):
(WebCore::RenderFlexibleBox::mainAxisContentExtentForFlexItemIncludingScrollbar
const):
(WebCore::isSVGRootWithIntrinsicAspectRatio):
(WebCore::flexItemHasAspectRatio):
(WebCore::RenderFlexibleBox::computeMainAxisExtentForFlexItem):
(WebCore::RenderFlexibleBox::flowAwareMarginStartForFlexItem const):
(WebCore::RenderFlexibleBox::flowAwareMarginEndForFlexItem const):
(WebCore::RenderFlexibleBox::flowAwareMarginBeforeForFlexItem const):
(WebCore::RenderFlexibleBox::initializeMarginTrimState):
(WebCore::RenderFlexibleBox::mainAxisMarginExtentForFlexItem const):
(WebCore::RenderFlexibleBox::crossAxisMarginExtentForFlexItem const):
(WebCore::RenderFlexibleBox::isChildEligibleForMarginTrim const):
(WebCore::RenderFlexibleBox::trimMainAxisMarginStart):
(WebCore::RenderFlexibleBox::trimMainAxisMarginEnd):
(WebCore::RenderFlexibleBox::trimCrossAxisMarginStart):
(WebCore::RenderFlexibleBox::trimCrossAxisMarginEnd):
(WebCore::RenderFlexibleBox::flowAwareLocationForFlexItem const):
(WebCore::RenderFlexibleBox::crossSizeLengthForFlexItem const):
(WebCore::RenderFlexibleBox::mainSizeLengthForFlexItem const):
(WebCore::RenderFlexibleBox::computeMainSizeFromAspectRatioUsing const):
(WebCore::RenderFlexibleBox::setFlowAwareLocationForFlexItem):
(WebCore::RenderFlexibleBox::canComputePercentageFlexBasis):
(WebCore::RenderFlexibleBox::flexItemMainSizeIsDefinite):
(WebCore::RenderFlexibleBox::flexItemHasComputableAspectRatio const):
(WebCore::RenderFlexibleBox::flexItemHasComputableAspectRatioAndCrossSizeIsConsideredDefinite):
(WebCore::RenderFlexibleBox::flexItemCrossSizeShouldUseContainerCrossSize
const):
(WebCore::RenderFlexibleBox::flexItemCrossSizeIsDefinite):
(WebCore::RenderFlexibleBox::cacheFlexItemMainSize):
(WebCore::RenderFlexibleBox::clearCachedMainSizeForFlexItem):
(WebCore::ScopedFlexBasisAsFlexItemMainSize::ScopedFlexBasisAsFlexItemMainSize):
(WebCore::ScopedFlexBasisAsFlexItemMainSize::~ScopedFlexBasisAsFlexItemMainSize):
(WebCore::RenderFlexibleBox::computeFlexBaseSizeForFlexItem):
(WebCore::RenderFlexibleBox::layoutFlexItems):
(WebCore::RenderFlexibleBox::autoMarginOffsetInMainAxis):
(WebCore::RenderFlexibleBox::updateAutoMarginsInMainAxis):
(WebCore::RenderFlexibleBox::hasAutoMarginsInCrossAxis const):
(WebCore::RenderFlexibleBox::availableAlignmentSpaceForFlexItem):
(WebCore::RenderFlexibleBox::updateAutoMarginsInCrossAxis):
(WebCore::RenderFlexibleBox::marginBoxAscentForFlexItem):
(WebCore::RenderFlexibleBox::computeFlexItemMarginValue):
(WebCore::RenderFlexibleBox::prepareOrderIteratorAndMargins):
(WebCore::RenderFlexibleBox::computeFlexItemMinMaxSizes):
(WebCore::RenderFlexibleBox::usedFlexItemOverridingCrossSizeForPercentageResolution):
(WebCore::RenderFlexibleBox::usedFlexItemOverridingMainSizeForPercentageResolution):
(WebCore::RenderFlexibleBox::usedFlexItemOverridingLogicalHeightForPercentageResolution):
(WebCore::RenderFlexibleBox::adjustFlexItemSizeForAspectRatioCrossAxisMinAndMax):
(WebCore::RenderFlexibleBox::maybeCacheFlexItemMainIntrinsicSize):
(WebCore::RenderFlexibleBox::constructFlexLayoutItem):
(WebCore::RenderFlexibleBox::freezeViolations):
(WebCore::RenderFlexibleBox::freezeInflexibleItems):
(WebCore::RenderFlexibleBox::resolveFlexibleLengths):
(WebCore::initialJustifyContentOffset):
(WebCore::justifyContentSpaceBetweenFlexItems):
(WebCore::alignmentOffset):
(WebCore::RenderFlexibleBox::setOverridingMainSizeForFlexItem):
(WebCore::RenderFlexibleBox::staticMainAxisPositionForPositionedFlexItem):
(WebCore::RenderFlexibleBox::staticCrossAxisPositionForPositionedFlexItem):
(WebCore::RenderFlexibleBox::staticInlinePositionForPositionedFlexItem):
(WebCore::RenderFlexibleBox::staticBlockPositionForPositionedFlexItem):
(WebCore::RenderFlexibleBox::setStaticPositionForPositionedLayout):
(WebCore::RenderFlexibleBox::computeCrossSizeForFlexItemUsingContainerCrossSize
const):
(WebCore::RenderFlexibleBox::prepareFlexItemForPositionedLayout):
(WebCore::RenderFlexibleBox::overflowAlignmentForFlexItem const):
(WebCore::RenderFlexibleBox::alignmentForFlexItem const):
(WebCore::RenderFlexibleBox::resetAutoMarginsAndLogicalTopInCrossAxis):
(WebCore::RenderFlexibleBox::needToStretchFlexItemLogicalHeight const):
(WebCore::RenderFlexibleBox::flexItemHasIntrinsicMainAxisSize):
(WebCore::RenderFlexibleBox::mainAxisOverflowForFlexItem const):
(WebCore::RenderFlexibleBox::crossAxisOverflowForFlexItem const):
(WebCore::RenderFlexibleBox::flexItemHasPercentHeightDescendants const):
(WebCore::RenderFlexibleBox::layoutAndPlaceFlexItems):
(WebCore::RenderFlexibleBox::layoutColumnReverse):
(WebCore::alignContentSpaceBetweenFlexItems):
(WebCore::RenderFlexibleBox::alignFlexLines):
(WebCore::RenderFlexibleBox::adjustAlignmentForFlexItem):
(WebCore::RenderFlexibleBox::alignFlexItems):
(WebCore::RenderFlexibleBox::performBaselineAlignment):
(WebCore::RenderFlexibleBox::applyStretchAlignmentToFlexItem):
(WebCore::RenderFlexibleBox::flipForRightToLeftColumn):
(WebCore::RenderFlexibleBox::flipForWrapReverse):
(WebCore::RenderFlexibleBox::getBaselineChild const): Deleted.
(WebCore::RenderFlexibleBox::appendChildFrameRects): Deleted.
(WebCore::RenderFlexibleBox::repaintChildrenDuringLayoutIfMoved): Deleted.
(WebCore::RenderFlexibleBox::mainAxisIsChildInlineAxis const): Deleted.
(WebCore::RenderFlexibleBox::shouldApplyMinSizeAutoForChild const): Deleted.
(WebCore::RenderFlexibleBox::shouldApplyMinBlockSizeAutoForChild const):
Deleted.
(WebCore::RenderFlexibleBox::flexBasisForChild const): Deleted.
(WebCore::RenderFlexibleBox::crossAxisExtentForChild const): Deleted.
(WebCore::RenderFlexibleBox::cachedChildIntrinsicContentLogicalHeight const):
Deleted.
(WebCore::RenderFlexibleBox::setCachedChildIntrinsicContentLogicalHeight):
Deleted.
(WebCore::RenderFlexibleBox::clearCachedChildIntrinsicContentLogicalHeight):
Deleted.
(WebCore::RenderFlexibleBox::childIntrinsicLogicalHeight const): Deleted.
(WebCore::RenderFlexibleBox::childIntrinsicLogicalWidth): Deleted.
(WebCore::RenderFlexibleBox::crossAxisIntrinsicExtentForChild): Deleted.
(WebCore::RenderFlexibleBox::mainAxisExtentForChild const): Deleted.
(WebCore::RenderFlexibleBox::mainAxisContentExtentForChildIncludingScrollbar
const): Deleted.
(WebCore::childHasAspectRatio): Deleted.
(WebCore::RenderFlexibleBox::computeMainAxisExtentForChild): Deleted.
(WebCore::RenderFlexibleBox::flowAwareMarginStartForChild const): Deleted.
(WebCore::RenderFlexibleBox::flowAwareMarginEndForChild const): Deleted.
(WebCore::RenderFlexibleBox::flowAwareMarginBeforeForChild const): Deleted.
(WebCore::RenderFlexibleBox::mainAxisMarginExtentForChild const): Deleted.
(WebCore::RenderFlexibleBox::crossAxisMarginExtentForChild const): Deleted.
(WebCore::RenderFlexibleBox::flowAwareLocationForChild const): Deleted.
(WebCore::RenderFlexibleBox::crossSizeLengthForChild const): Deleted.
(WebCore::RenderFlexibleBox::mainSizeLengthForChild const): Deleted.
(WebCore::RenderFlexibleBox::setFlowAwareLocationForChild): Deleted.
(WebCore::RenderFlexibleBox::childMainSizeIsDefinite): Deleted.
(WebCore::RenderFlexibleBox::childHasComputableAspectRatio const): Deleted.
(WebCore::RenderFlexibleBox::childHasComputableAspectRatioAndCrossSizeIsConsideredDefinite):
Deleted.
(WebCore::RenderFlexibleBox::childCrossSizeShouldUseContainerCrossSize const):
Deleted.
(WebCore::RenderFlexibleBox::childCrossSizeIsDefinite): Deleted.
(WebCore::RenderFlexibleBox::cacheChildMainSize): Deleted.
(WebCore::RenderFlexibleBox::clearCachedMainSizeForChild): Deleted.
(WebCore::ScopedFlexBasisAsChildMainSize::ScopedFlexBasisAsChildMainSize):
Deleted.
(WebCore::ScopedFlexBasisAsChildMainSize::~ScopedFlexBasisAsChildMainSize):
Deleted.
(WebCore::RenderFlexibleBox::computeFlexBaseSizeForChild): Deleted.
(WebCore::RenderFlexibleBox::availableAlignmentSpaceForChild): Deleted.
(WebCore::RenderFlexibleBox::marginBoxAscentForChild): Deleted.
(WebCore::RenderFlexibleBox::computeChildMarginValue): Deleted.
(WebCore::RenderFlexibleBox::usedChildOverridingCrossSizeForPercentageResolution):
Deleted.
(WebCore::RenderFlexibleBox::usedChildOverridingMainSizeForPercentageResolution):
Deleted.
(WebCore::RenderFlexibleBox::usedChildOverridingLogicalHeightForPercentageResolution):
Deleted.
(WebCore::RenderFlexibleBox::adjustChildSizeForAspectRatioCrossAxisMinAndMax):
Deleted.
(WebCore::RenderFlexibleBox::maybeCacheChildMainIntrinsicSize): Deleted.
(WebCore::RenderFlexibleBox::constructFlexItem): Deleted.
(WebCore::justifyContentSpaceBetweenChildren): Deleted.
(WebCore::RenderFlexibleBox::setOverridingMainSizeForChild): Deleted.
(WebCore::RenderFlexibleBox::staticMainAxisPositionForPositionedChild): Deleted.
(WebCore::RenderFlexibleBox::staticCrossAxisPositionForPositionedChild):
Deleted.
(WebCore::RenderFlexibleBox::staticInlinePositionForPositionedChild): Deleted.
(WebCore::RenderFlexibleBox::staticBlockPositionForPositionedChild): Deleted.
(WebCore::RenderFlexibleBox::computeCrossSizeForChildUsingContainerCrossSize
const): Deleted.
(WebCore::RenderFlexibleBox::prepareChildForPositionedLayout): Deleted.
(WebCore::RenderFlexibleBox::overflowAlignmentForChild const): Deleted.
(WebCore::RenderFlexibleBox::alignmentForChild const): Deleted.
(WebCore::RenderFlexibleBox::needToStretchChildLogicalHeight const): Deleted.
(WebCore::RenderFlexibleBox::childHasIntrinsicMainAxisSize): Deleted.
(WebCore::RenderFlexibleBox::mainAxisOverflowForChild const): Deleted.
(WebCore::RenderFlexibleBox::crossAxisOverflowForChild const): Deleted.
(WebCore::RenderFlexibleBox::childHasPercentHeightDescendants const): Deleted.
(WebCore::RenderFlexibleBox::layoutAndPlaceChildren): Deleted.
(WebCore::alignContentSpaceBetweenChildren): Deleted.
(WebCore::RenderFlexibleBox::adjustAlignmentForChild): Deleted.
(WebCore::RenderFlexibleBox::alignChildren): Deleted.
(WebCore::RenderFlexibleBox::applyStretchAlignmentToChild): Deleted.
* Source/WebCore/rendering/RenderFlexibleBox.h:
* Source/WebCore/rendering/RenderLayerScrollableArea.cpp:
(WebCore::RenderLayerScrollableArea::updateScrollbarsAfterLayout):
* Source/WebCore/rendering/updating/RenderTreeBuilder.cpp:
(WebCore::resetRendererStateOnDetach):
Canonical link: https://commits.webkit.org/280951@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
