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 885424 part 4: Refactor ComputeFlexContainerMainSize to have a clearer horizontal case vs. vertical case. r=dbaron

Browse Source
This commit is contained in:
Daniel Holbert 2013-07-11 16:47:03 -07:00
parent fcbc026824
commit 48e5024923
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
layout/generic/nsFlexContainerFrame.cpp
View File

@ -1957,35 +1957,31 @@ nsFlexContainerFrame::ComputeFlexContainerMainSize(
const FlexboxAxisTracker& aAxisTracker,
const nsTArray<FlexItem>& aItems)
{
// If we've got a finite computed main-size, use that.
nscoord mainSize =
aAxisTracker.GetMainComponent(nsSize(aReflowState.ComputedWidth(),
aReflowState.ComputedHeight()));
if (mainSize != NS_UNCONSTRAINEDSIZE) {
return mainSize;
if (IsAxisHorizontal(aAxisTracker.GetMainAxis())) {
// Horizontal case is easy -- our main size is our computed width
// (which is already resolved).
return aReflowState.ComputedWidth();
}
NS_WARN_IF_FALSE(!IsAxisHorizontal(aAxisTracker.GetMainAxis()),
"Computed width should always be constrained, so horizontal "
"flex containers should have a constrained main-size");
// Vertical case, with non-auto-height:
if (aReflowState.ComputedHeight() != NS_AUTOHEIGHT) {
return aReflowState.ComputedHeight();
}
// Otherwise, use the sum of our items' hypothetical main sizes, clamped
// to our computed min/max main-size properties.
mainSize = 0;
// Vertical case, with auto-height:
// Resolve auto-height to the sum of our items' hypothetical outer main
// sizes (their outer heights), clamped to our computed min/max main-size
// properties (min-height & max-height).
nscoord sumOfChildHeights = 0;
for (uint32_t i = 0; i < aItems.Length(); ++i) {
mainSize +=
sumOfChildHeights +=
aItems[i].GetMainSize() +
aItems[i].GetMarginBorderPaddingSizeInAxis(aAxisTracker.GetMainAxis());
}
nscoord minMainSize =
aAxisTracker.GetMainComponent(nsSize(aReflowState.mComputedMinWidth,
aReflowState.mComputedMinHeight));
nscoord maxMainSize =
aAxisTracker.GetMainComponent(nsSize(aReflowState.mComputedMaxWidth,
aReflowState.mComputedMaxHeight));
return NS_CSS_MINMAX(mainSize, minMainSize, maxMainSize);
return NS_CSS_MINMAX(sumOfChildHeights,
aReflowState.mComputedMinHeight,
aReflowState.mComputedMaxHeight);
}
void