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 903880 part 1: Create a helper-function to set a flex item's base size (and update its hypothetical main size). r=dbaron

Browse Source
This commit is contained in:
Daniel Holbert 2013-10-31 19:39:02 -07:00
parent 06b8961622
commit b029a624fa
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
layout/generic/nsFlexContainerFrame.cpp
View File

@ -368,6 +368,20 @@ public:
// Setters
// =======
// This sets our flex base size, and then updates the main size to the
// base size clamped to our main-axis [min,max] constraints.
void SetFlexBaseSizeAndMainSize(nscoord aNewFlexBaseSize)
{
MOZ_ASSERT(!mIsFrozen,
"flex base size shouldn't change after we're frozen");
mFlexBaseSize = aNewFlexBaseSize;
// Before we've resolved flexible lengths, we keep mMainSize set to
// the 'hypothetical main size', which is the flex base size, clamped
// to the [min,max] range:
mMainSize = NS_CSS_MINMAX(mFlexBaseSize, mMainMinSize, mMainMaxSize);
}
// Setters used while we're resolving flexible lengths
// ---------------------------------------------------
@ -463,7 +477,7 @@ protected:
const nsMargin mBorderPadding;
nsMargin mMargin; // non-const because we need to resolve auto margins
const nscoord mFlexBaseSize;
nscoord mFlexBaseSize;
const nscoord mMainMinSize;
const nscoord mMainMaxSize;
@ -847,14 +861,10 @@ FlexItem::FlexItem(nsIFrame* aChildFrame,
mFlexShrink(aFlexShrink),
mBorderPadding(aBorderPadding),
mMargin(aMargin),
mFlexBaseSize(aFlexBaseSize),
mMainMinSize(aMainMinSize),
mMainMaxSize(aMainMaxSize),
mCrossMinSize(aCrossMinSize),
mCrossMaxSize(aCrossMaxSize),
// Init main-size to 'hypothetical main size', which is flex base size
// clamped to [min,max] range:
mMainSize(NS_CSS_MINMAX(aFlexBaseSize, aMainMinSize, aMainMaxSize)),
mMainPosn(0),
mCrossSize(0),
mCrossPosn(0),
@ -869,6 +879,8 @@ FlexItem::FlexItem(nsIFrame* aChildFrame,
{
MOZ_ASSERT(aChildFrame, "expecting a non-null child frame");
SetFlexBaseSizeAndMainSize(aFlexBaseSize);
// Assert that any "auto" margin components are set to 0.
// (We'll resolve them later; until then, we want to treat them as 0-sized.)
#ifdef DEBUG