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 1054058 part 3: Use local var to cache flex item's "normal" block offset in container, rather than looking it up. r=mats

Browse Source
This commit is contained in:
Daniel Holbert 2015-01-22 15:12:11 -08:00
parent 96338ed43c
commit afb7d0b7b6
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layout/generic/nsFlexContainerFrame.cpp
View File

@ -3679,6 +3679,10 @@ nsFlexContainerFrame::DoFlexLayout(nsPresContext* aPresContext,
LogicalPoint framePos(outerWM, physicalPosn,
containerWidth - item->Frame()->GetRect().width);
// (Intentionally snapshotting this before ApplyRelativePositioning, to
// maybe use for setting the flex container's baseline.)
const nscoord itemNormalBPos = framePos.B(outerWM);
WritingMode wm = item->Frame()->GetWritingMode();
LogicalSize availSize = aReflowState.ComputedSize(wm);
availSize.BSize(wm) = NS_UNCONSTRAINEDSIZE;
@ -3776,13 +3780,7 @@ nsFlexContainerFrame::DoFlexLayout(nsPresContext* aPresContext,
// children), then use this child's baseline as the container's baseline.
if (item->Frame() == mFrames.FirstChild() &&
flexContainerAscent == nscoord_MIN) {
// (We use GetNormalPosition() instead of physicalPosn because we don't
// want relative positioning on the child to affect the baseline that we
// read from it).
flexContainerAscent = item->Frame()->GetLogicalNormalPosition(
outerWM,
childDesiredSize.Width()).B(outerWM) +
item->ResolvedAscent();
flexContainerAscent = itemNormalBPos + item->ResolvedAscent();
}
}
}