roytam1/UXP
1
0
Fork 0
mirror of https://github.com/roytam1/UXP.git synced 2026-05-29 16:58:28 +00:00
Code Issues Projects Releases Wiki Activity

[css-grid] Don't shrink-wrap the inline size when we have an available size when measuring block size

Browse Source
This commit is contained in:
JustOff
2018-10-20 16:25:28 +03:00
committed by Roy Tam
parent 44f9b7ec97
commit ff78530425
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
layout/generic/nsGridContainerFrame.cpp
+5 -3
View File
@@ -3714,8 +3714,11 @@ MeasuringReflow(nsIFrame* aChild,
parent->Properties().Set(
nsContainerFrame::DebugReflowingWithInfiniteISize(), true);
#endif
uint32_t riFlags = ReflowInput::COMPUTE_SIZE_SHRINK_WRAP |
ReflowInput::COMPUTE_SIZE_USE_AUTO_BSIZE;
auto wm = aChild->GetWritingMode();
uint32_t riFlags = ReflowInput::COMPUTE_SIZE_USE_AUTO_BSIZE;
if (aAvailableSize.ISize(wm) == INFINITE_ISIZE_COORD) {
riFlags |= ReflowInput::COMPUTE_SIZE_SHRINK_WRAP;
}
if (aIMinSizeClamp != NS_MAXSIZE) {
riFlags |= ReflowInput::I_CLAMP_MARGIN_BOX_MIN_SIZE;
}
@@ -3730,7 +3733,6 @@ MeasuringReflow(nsIFrame* aChild,
ReflowOutput childSize(childRI);
nsReflowStatus childStatus;
const uint32_t flags = NS_FRAME_NO_MOVE_FRAME | NS_FRAME_NO_SIZE_VIEW;
WritingMode wm = childRI.GetWritingMode();
parent->ReflowChild(aChild, pc, childSize, childRI, wm,
LogicalPoint(wm), nsSize(), flags, childStatus);
parent->FinishReflowChild(aChild, pc, childSize, &childRI, wm,