Bug 1353573 - Don't try to preserve frame state bits across the ReflowInput ctor. r=dbaron

MozReview-Commit-ID: CjaUQjlv3ll
This commit is contained in:
Mats Palmgren 2017-04-10 19:25:58 +02:00
Родитель 1828ea89ca
Коммит e0c482815a
1 изменённых файлов: 0 добавлений и 4 удалений

Просмотреть файл

@ -9976,15 +9976,11 @@ nsFrame::BoxReflow(nsBoxLayoutState& aState,
parentSize.width += margin.LeftRight();
nsIFrame *parentFrame = GetParent();
nsFrameState savedState = parentFrame->GetStateBits();
WritingMode parentWM = parentFrame->GetWritingMode();
ReflowInput
parentReflowInput(aPresContext, parentFrame, aRenderingContext,
LogicalSize(parentWM, parentSize),
ReflowInput::DUMMY_PARENT_REFLOW_STATE);
const nsFrameState bitsToLeaveUntouched = NS_FRAME_HAS_PROPERTIES;
parentFrame->RemoveStateBits(~bitsToLeaveUntouched);
parentFrame->AddStateBits(savedState & ~bitsToLeaveUntouched);
// This may not do very much useful, but it's probably worth trying.
if (parentSize.width != NS_INTRINSICSIZE)