author | Ting-Yu Lin <tlin@mozilla.com> |
Mon, 05 Sep 2016 15:36:53 +0800 | |
changeset 313294 | 8d8754d431f311605926dbb8414337aa39ba059b |
parent 313293 | 5947f7b762ef39c1bb33916cc20e7c849afdf51c |
child 313295 | 31f1b0aa5308eebc39635a76db6016e0598e33ad |
push id | 32161 |
push user | tlin@mozilla.com |
push date | Fri, 09 Sep 2016 07:06:30 +0000 |
treeherder | autoland@37577db30368 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bz |
bugs | 1299753 |
milestone | 51.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/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -3284,18 +3284,17 @@ nsCSSFrameConstructor::ConstructFieldSet NS_NewColumnSetFrame(mPresShell, fieldsetContentStyle, nsFrameState(0)); InitAndRestoreFrame(aState, content, parent, columnSetFrame); innerSC = mPresShell->StyleSet()->ResolveAnonymousBoxStyle( nsCSSAnonBoxes::columnContent, fieldsetContentStyle); if (absPosContainer) { absPosContainer = columnSetFrame; } } - contentFrame = NS_NewBlockFrame(mPresShell, innerSC, - NS_BLOCK_FLOAT_MGR | NS_BLOCK_MARGIN_ROOT); + contentFrame = NS_NewBlockFormattingContext(mPresShell, innerSC); if (columnSetFrame) { InitAndRestoreFrame(aState, content, columnSetFrame, contentFrame); SetInitialSingleChild(columnSetFrame, contentFrame); contentFrameTop = columnSetFrame; } else { InitAndRestoreFrame(aState, content, parent, contentFrame); contentFrameTop = contentFrame; }