зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1307113 - [css-grid] Fix a typo in baseline track selection. r=dholbert
This commit is contained in:
Родитель
89949b605d
Коммит
21939c963e
|
@ -4061,11 +4061,11 @@ nsGridContainerFrame::Tracks::InitializeItemBaselines(
|
|||
if (selfAlignment == NS_STYLE_ALIGN_BASELINE) {
|
||||
state |= ItemState::eFirstBaseline | ItemState::eSelfBaseline;
|
||||
const GridArea& area = gridItem.mArea;
|
||||
baselineTrack = isOrthogonal ? area.mCols.mStart : area.mRows.mStart;
|
||||
baselineTrack = isInlineAxis ? area.mCols.mStart : area.mRows.mStart;
|
||||
} else if (selfAlignment == NS_STYLE_ALIGN_LAST_BASELINE) {
|
||||
state |= ItemState::eLastBaseline | ItemState::eSelfBaseline;
|
||||
const GridArea& area = gridItem.mArea;
|
||||
baselineTrack = (isOrthogonal ? area.mCols.mEnd : area.mRows.mEnd) - 1;
|
||||
baselineTrack = (isInlineAxis ? area.mCols.mEnd : area.mRows.mEnd) - 1;
|
||||
}
|
||||
|
||||
// [align|justify]-content:[last-]baseline.
|
||||
|
@ -4123,10 +4123,10 @@ nsGridContainerFrame::Tracks::InitializeItemBaselines(
|
|||
const GridArea& area = gridItem.mArea;
|
||||
if (alignContent == NS_STYLE_ALIGN_BASELINE) {
|
||||
state |= ItemState::eFirstBaseline | ItemState::eContentBaseline;
|
||||
baselineTrack = isOrthogonal ? area.mCols.mStart : area.mRows.mStart;
|
||||
baselineTrack = isInlineAxis ? area.mCols.mStart : area.mRows.mStart;
|
||||
} else if (alignContent == NS_STYLE_ALIGN_LAST_BASELINE) {
|
||||
state |= ItemState::eLastBaseline | ItemState::eContentBaseline;
|
||||
baselineTrack = (isOrthogonal ? area.mCols.mEnd : area.mRows.mEnd) - 1;
|
||||
baselineTrack = (isInlineAxis ? area.mCols.mEnd : area.mRows.mEnd) - 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче