author | Daniel Holbert <dholbert@cs.stanford.edu> |
Thu, 17 Jan 2013 21:32:31 -0800 | |
changeset 119238 | e7b94c8df70c6ee84fce581803644c021f0dccd5 |
parent 119237 | de2ab911692d91f6ea017d1d0f9d0a6d295ce6b5 |
child 119239 | 2d791defc804f4f33585370876beba3591d00c8b |
push id | 24195 |
push user | Ms2ger@gmail.com |
push date | Sat, 19 Jan 2013 16:10:11 +0000 |
treeherder | mozilla-central@02e12a80aef9 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
milestone | 21.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/layout/generic/nsFlexContainerFrame.cpp +++ b/layout/generic/nsFlexContainerFrame.cpp @@ -2206,19 +2206,18 @@ nsFlexContainerFrame::Reflow(nsPresConte // If this item's height is stretched, it's a relative height. curItem.Frame()->AddStateBits(NS_FRAME_CONTAINS_RELATIVE_HEIGHT); childReflowState.SetComputedHeight(curItem.GetCrossSize()); } } // XXXdholbert Might need to actually set the correct margins in the // reflow state at some point, so that they can be saved on the frame for - // UsedMarginPropeorty(). Maybe doesn't matter though...? + // UsedMarginProperty(). Maybe doesn't matter though...? - // XXXdholbert Assuming horizontal nscoord mainPosn = curItem.GetMainPosition(); nscoord crossPosn = curItem.GetCrossPosition(); if (!AxisGrowsInPositiveDirection(axisTracker.GetMainAxis())) { mainPosn = frameMainSize - mainPosn; } if (!AxisGrowsInPositiveDirection(axisTracker.GetCrossAxis())) { crossPosn = frameCrossSize - crossPosn; }