corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1654541 - Rename eFitContent to eApplyFitContentClamping. r=emilio

Browse Source 
Depends on D226204

Differential Revision: https://phabricator.services.mozilla.com/D227324
This commit is contained in:
Connor Pearson
2024-10-30 15:40:34 +00:00
parent 4acf8e5dc8
commit 169b33896d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
layout/generic/nsGridContainerFrame.cpp
View File

@@ -381,7 +381,7 @@ struct nsGridContainerFrame::TrackSize {
eSkipGrowUnlimited2 = 0x400,
eSkipGrowUnlimited = eSkipGrowUnlimited1 | eSkipGrowUnlimited2,
eBreakBefore = 0x800,
eFitContent = 0x1000,
eApplyFitContentClamping = 0x1000,
eInfinitelyGrowable = 0x2000,
// These are only used in the masonry axis. They share the same value
@@ -450,7 +450,7 @@ TrackSize::StateBits nsGridContainerFrame::TrackSize::Initialize(
// In layout, fit-content(size) behaves as minmax(auto, max-content), with
// 'size' as an additional upper-bound.
if (!::IsPercentOfIndefiniteSize(aSize.AsFitContent(), aPercentageBasis)) {
mState = eFitContent;
mState = eApplyFitContentClamping;
}
minSizeTag = Tag::Auto;
maxSizeTag = Tag::MaxContent;
@@ -2521,7 +2521,7 @@ struct nsGridContainerFrame::Tracks {
}
nscoord newBase = sz.mBase + spacePerTrack;
nscoord limit = sz.mLimit;
if (MOZ_UNLIKELY((sz.mState & TrackSize::eFitContent) &&
if (MOZ_UNLIKELY((sz.mState & TrackSize::eApplyFitContentClamping) &&
aFitContentClamper)) {
// Clamp the limit to the fit-content() size, for §12.5.2 step 5/6.
aFitContentClamper(track, sz.mBase, &limit);
@@ -2647,7 +2647,7 @@ struct nsGridContainerFrame::Tracks {
}
nscoord delta = spacePerTrack;
nscoord newBase = sz.mBase + delta;
if (MOZ_UNLIKELY((sz.mState & TrackSize::eFitContent) &&
if (MOZ_UNLIKELY((sz.mState & TrackSize::eApplyFitContentClamping) &&
aFitContentClamper)) {
// Clamp newBase to the fit-content() size, for §12.5.2 step 5/6.
if (aFitContentClamper(track, sz.mBase, &newBase)) {
@@ -5976,7 +5976,7 @@ static void AddSubgridContribution(TrackSize& aSize,
// XXX maybe eFlexMaxSizing too?
// (once we implement https://github.com/w3c/csswg-drafts/issues/2177)
if (aSize.mState &
(TrackSize::eIntrinsicMaxSizing | TrackSize::eFitContent)) {
(TrackSize::eIntrinsicMaxSizing | TrackSize::eApplyFitContentClamping)) {
aSize.mLimit = std::max(aSize.mLimit, aMarginBorderPadding);
}
}
@@ -6036,7 +6036,7 @@ bool nsGridContainerFrame::Tracks::ResolveIntrinsicSizeForNonSpanningItems(
} else {
sz.mLimit = std::max(sz.mLimit, s);
}
if (MOZ_UNLIKELY(sz.mState & TrackSize::eFitContent)) {
if (MOZ_UNLIKELY(sz.mState & TrackSize::eApplyFitContentClamping)) {
// Clamp mLimit to the fit-content() size, for §12.5.1.
nscoord fitContentClamp = aFunctions.SizingFor(aRange.mStart)
.AsFitContent()
@@ -6295,7 +6295,8 @@ void nsGridContainerFrame::Tracks::InitializeItemBaselines(
std::find_if(range.begin(), range.end(), [&](auto track) {
constexpr auto intrinsicSizeFlags =
TrackSize::eIntrinsicMinSizing |
TrackSize::eIntrinsicMaxSizing | TrackSize::eFitContent |
TrackSize::eIntrinsicMaxSizing |
TrackSize::eApplyFitContentClamping |
TrackSize::eFlexMaxSizing;
return (mSizes[track].mState & intrinsicSizeFlags) != 0;
}) != range.end();