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

Bug 1870983 - Remove child pos workaround when XUL is a grid item. r=dholbert

Browse Source 
This patch reverts this patch
https://hg.mozilla.org/mozilla-central/rev/2d39de2be1ae (bug 1593060).

Note: some of the code (around `::MeasuringReflow`) has been reverted in
https://hg.mozilla.org/mozilla-central/rev/cd9c32d42c40 (Bug 1600542).

Differential Revision: https://phabricator.services.mozilla.com/D196939
This commit is contained in:
Ting-Yu Lin
2023-12-20 22:28:42 +00:00
parent 7edacad7be
commit eba54dc01f
4 changed files with 3 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
layout/generic/nsGridContainerFrame.cpp
View File

@@ -7484,33 +7484,10 @@ void nsGridContainerFrame::ReflowInFlowChild(
ReflowOutput childSize(childRI);
const nsSize dummyContainerSize;
// XXXdholbert The childPos that we use for ReflowChild shouldn't matter,
// since we finalize it in FinishReflowChild. However, it does matter if the
// child happens to be XUL (which sizes menu popup frames based on the
// position within the viewport, during this ReflowChild call). So we make an
// educated guess that the child will be at the origin of its containing
// block, and then use align/justify to correct that as-needed further
// down. (If the child has a different writing mode than its parent, though,
// then we can't express the CB origin until we've reflowed the child and
// determined its size. In that case, we throw up our hands and don't bother
// trying to guess the position up-front after all.)
// XXXdholbert We'll remove this special case in bug 1600542, and then we can
// go back to just setting childPos in a single call after ReflowChild.
LogicalPoint childPos(childWM);
if (MOZ_LIKELY(childWM == wm)) {
// Initially, assume the child will be at the containing block origin.
// (This may get corrected during alignment/justification below.)
childPos = cb.Origin(wm);
}
ReflowChild(aChild, pc, childSize, childRI, childWM, childPos,
ReflowChild(aChild, pc, childSize, childRI, childWM, LogicalPoint(childWM),
dummyContainerSize, ReflowChildFlags::Default, aStatus);
if (MOZ_UNLIKELY(childWM != wm)) {
// As above: assume the child will be at the containing block origin.
// (which we can now compute in terms of the childWM, now that we know the
// child's size).
childPos = cb.Origin(wm).ConvertTo(
childWM, wm, aContainerSize - childSize.PhysicalSize());
}
LogicalPoint childPos = cb.Origin(wm).ConvertTo(
childWM, wm, aContainerSize - childSize.PhysicalSize());
// Apply align/justify-self and reflow again if that affects the size.
if (MOZ_LIKELY(isGridItem)) {
LogicalSize size = childSize.Size(childWM); // from the ReflowChild()