diff options
Diffstat (limited to 'layout/generic/nsGridContainerFrame.cpp')
-rw-r--r-- | layout/generic/nsGridContainerFrame.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/layout/generic/nsGridContainerFrame.cpp b/layout/generic/nsGridContainerFrame.cpp index bb6e2150ce..48c70cd479 100644 --- a/layout/generic/nsGridContainerFrame.cpp +++ b/layout/generic/nsGridContainerFrame.cpp @@ -4317,7 +4317,7 @@ int32_t nsGridContainerFrame::Grid::ResolveLine( bool useStart = IsNameWithStartSuffix(aLine.LineName(), &index); if (useStart || IsNameWithEndSuffix(aLine.LineName(), &index)) { auto side = MakeLogicalSide( - GetAxis(aSide), useStart ? eLogicalEdgeStart : eLogicalEdgeEnd); + GetAxis(aSide), useStart ? LogicalEdge::Start : LogicalEdge::End); RefPtr<nsAtom> name = NS_Atomize(nsDependentSubstring( nsDependentAtomString(aLine.LineName()), 0, index)); aNameMap.FindNamedAreas(name, side, implicitLines); @@ -4377,7 +4377,7 @@ nsGridContainerFrame::Grid::ResolveLineRangeHelper( uint32_t from = aEnd.line_num < 0 ? aExplicitGridEnd + 1 : 0; auto end = ResolveLine(aEnd, aEnd.line_num, from, aNameMap, - MakeLogicalSide(aAxis, eLogicalEdgeEnd), + MakeLogicalSide(aAxis, LogicalEdge::End), aExplicitGridEnd, aStyle); int32_t span = aStart.line_num == 0 ? 1 : aStart.line_num; if (end <= 1) { @@ -4387,7 +4387,7 @@ nsGridContainerFrame::Grid::ResolveLineRangeHelper( return LinePair(start, end); } auto start = ResolveLine(aStart, -span, end, aNameMap, - MakeLogicalSide(aAxis, eLogicalEdgeStart), + MakeLogicalSide(aAxis, LogicalEdge::Start), aExplicitGridEnd, aStyle); return LinePair(start, end); } @@ -4411,7 +4411,7 @@ nsGridContainerFrame::Grid::ResolveLineRangeHelper( } else { uint32_t from = aStart.line_num < 0 ? aExplicitGridEnd + 1 : 0; start = ResolveLine(aStart, aStart.line_num, from, aNameMap, - MakeLogicalSide(aAxis, eLogicalEdgeStart), + MakeLogicalSide(aAxis, LogicalEdge::Start), aExplicitGridEnd, aStyle); if (aEnd.IsAuto()) { // A "definite line / auto" should resolve the auto to 'span 1'. @@ -4441,7 +4441,7 @@ nsGridContainerFrame::Grid::ResolveLineRangeHelper( from = aEnd.line_num < 0 ? aExplicitGridEnd + 1 : 0; } auto end = ResolveLine(aEnd, nth, from, aNameMap, - MakeLogicalSide(aAxis, eLogicalEdgeEnd), + MakeLogicalSide(aAxis, LogicalEdge::End), aExplicitGridEnd, aStyle); if (start == int32_t(kAutoLine)) { // auto / definite line @@ -4527,7 +4527,7 @@ nsGridContainerFrame::Grid::ResolveAbsPosLineRange( } uint32_t from = aEnd.line_num < 0 ? aExplicitGridEnd + 1 : 0; int32_t end = ResolveLine(aEnd, aEnd.line_num, from, aNameMap, - MakeLogicalSide(aAxis, eLogicalEdgeEnd), + MakeLogicalSide(aAxis, LogicalEdge::End), aExplicitGridEnd, aStyle); if (aEnd.is_span) { ++end; @@ -4540,7 +4540,7 @@ nsGridContainerFrame::Grid::ResolveAbsPosLineRange( if (aEnd.IsAuto()) { uint32_t from = aStart.line_num < 0 ? aExplicitGridEnd + 1 : 0; int32_t start = ResolveLine(aStart, aStart.line_num, from, aNameMap, - MakeLogicalSide(aAxis, eLogicalEdgeStart), + MakeLogicalSide(aAxis, LogicalEdge::Start), aExplicitGridEnd, aStyle); if (aStart.is_span) { start = std::max(aGridEnd - start, aGridStart); @@ -5761,7 +5761,7 @@ static nscoord MinSize(const GridItemInfo& aGridItem, PhysicalAxis axis(aCBWM.PhysicalAxis(aAxis)); const nsStylePosition* stylePos = child->StylePosition(); StyleSize sizeStyle = - axis == eAxisHorizontal ? stylePos->mWidth : stylePos->mHeight; + axis == PhysicalAxis::Horizontal ? stylePos->mWidth : stylePos->mHeight; auto ourInlineAxis = child->GetWritingMode().PhysicalAxis(LogicalAxis::Inline); @@ -5800,8 +5800,9 @@ static nscoord MinSize(const GridItemInfo& aGridItem, nsLayoutUtils::MinSizeContributionForAxis( axis, aRC, child, IntrinsicISizeType::MinISize, *aCache->mPercentageBasis); - const StyleSize& style = - axis == eAxisHorizontal ? stylePos->mMinWidth : stylePos->mMinHeight; + const StyleSize& style = axis == PhysicalAxis::Horizontal + ? stylePos->mMinWidth + : stylePos->mMinHeight; // max-content and min-content should behave as initial value in block axis. // FIXME: Bug 567039: moz-fit-content and -moz-available are not supported // for block size dimension on sizing properties (e.g. height), so we @@ -6017,7 +6018,7 @@ void nsGridContainerFrame::Tracks::InitializeItemBaselines( // against the physical block start side of the child to determine its // baseline sharing group. auto containerBlockStartSide = - containerWM.PhysicalSide(MakeLogicalSide(mAxis, eLogicalEdgeStart)); + containerWM.PhysicalSide(MakeLogicalSide(mAxis, LogicalEdge::Start)); for (GridItemInfo& gridItem : aGridItems) { if (gridItem.IsSubgrid(mAxis)) { @@ -6124,7 +6125,7 @@ void nsGridContainerFrame::Tracks::InitializeItemBaselines( { auto childAxis = isOrthogonal ? GetOrthogonalAxis(mAxis) : mAxis; auto childBlockStartSide = childWM.PhysicalSide( - MakeLogicalSide(childAxis, eLogicalEdgeStart)); + MakeLogicalSide(childAxis, LogicalEdge::Start)); bool isFirstBaseline = (state & ItemState::eFirstBaseline) != 0; const bool containerAndChildHasEqualBaselineSide = containerBlockStartSide == childBlockStartSide; |