wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1230695 - [css-grid] abs.pos. child spanning from an 'auto' start position to an end line should end on the start side of the gutter. r=dholbert

Browse Source
This commit is contained in:
Mats Palmgren 2015-12-09 23:46:58 +01:00
parent fdcbf95449
commit 6662141e87
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
layout/generic/nsGridContainerFrame.cpp
View File

@ -813,16 +813,29 @@ IsNameWithStartSuffix(const nsString& aString, uint32_t* aIndex)
return IsNameWithSuffix(aString, NS_LITERAL_STRING("-start"), aIndex);
}
enum class GridLineSide {
eBeforeGridGap,
eAfterGridGap,
};
static nscoord
GridLinePosition(uint32_t aLine, const nsTArray<TrackSize>& aTrackSizes)
GridLineEdge(uint32_t aLine, const nsTArray<TrackSize>& aTrackSizes,
GridLineSide aSide)
{
if (aTrackSizes.Length() == 0) {
if (MOZ_UNLIKELY(aTrackSizes.IsEmpty())) {
// https://drafts.csswg.org/css-grid/#grid-definition
// "... the explicit grid still contains one grid line in each axis."
MOZ_ASSERT(aLine == 0, "We should only resolve line 1 in an empty grid");
return nscoord(0);
}
MOZ_ASSERT(aLine <= aTrackSizes.Length(), "aTrackSizes is too small");
if (aSide == GridLineSide::eBeforeGridGap) {
if (aLine == 0) {
return aTrackSizes[0].mPosition;
}
const TrackSize& sz = aTrackSizes[aLine - 1];
return sz.mPosition + sz.mBase;
}
if (aLine == aTrackSizes.Length()) {
const TrackSize& sz = aTrackSizes[aLine - 1];
return sz.mPosition + sz.mBase;
@ -2784,13 +2797,15 @@ nsGridContainerFrame::LineRange::ToPositionAndLengthForAbsPos(
// done
} else {
const nscoord endPos = *aPos + *aLength;
nscoord startPos = ::GridLinePosition(mStart, aTrackSizes);
nscoord startPos =
::GridLineEdge(mStart, aTrackSizes, GridLineSide::eAfterGridGap);
*aPos = aGridOrigin + startPos;
*aLength = std::max(endPos - *aPos, 0);
}
} else {
if (mStart == kAutoLine) {
nscoord endPos = ::GridLinePosition(mEnd, aTrackSizes);
nscoord endPos =
::GridLineEdge(mEnd, aTrackSizes, GridLineSide::eBeforeGridGap);
*aLength = std::max(aGridOrigin + endPos, 0);
} else {
nscoord pos;