bug 1058954 - use logical-size with the proper writing mode when setting up to call ReflowAbsoluteFrames. r=smontagu

This commit is contained in:
Jonathan Kew 2014-08-28 16:00:01 +01:00
Родитель 243ef920e1
Коммит 3541c9b029
1 изменённых файлов: 3 добавлений и 3 удалений

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

@ -8146,7 +8146,7 @@ nsFrame::DoLayout(nsBoxLayoutState& aState)
const WritingMode outerWM = aState.OuterReflowState() ?
aState.OuterReflowState()->GetWritingMode() : ourWM;
nsHTMLReflowMetrics desiredSize(outerWM);
LogicalSize ourSize = GetLogicalSize().ConvertTo(outerWM, ourWM);
LogicalSize ourSize = GetLogicalSize(outerWM);
if (rendContext) {
@ -8186,7 +8186,7 @@ nsFrame::DoLayout(nsBoxLayoutState& aState)
}
// Should we do this if IsCollapsed() is true?
LogicalSize size(GetLogicalSize().ConvertTo(outerWM, ourWM));
LogicalSize size(GetLogicalSize(outerWM));
desiredSize.ISize(outerWM) = size.ISize(outerWM);
desiredSize.BSize(outerWM) = size.BSize(outerWM);
desiredSize.UnionOverflowAreasWithDesiredBounds();
@ -8195,7 +8195,7 @@ nsFrame::DoLayout(nsBoxLayoutState& aState)
// Set up a |reflowState| to pass into ReflowAbsoluteFrames
nsHTMLReflowState reflowState(aState.PresContext(), this,
aState.GetRenderingContext(),
LogicalSize(ourWM, size.ISize(ourWM),
LogicalSize(ourWM, ISize(),
NS_UNCONSTRAINEDSIZE),
nsHTMLReflowState::DUMMY_PARENT_REFLOW_STATE);