Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1141867 - patch 1 - Use the proper writing mode to return the inline-size from FloatMarginISize. r=smontagu

Browse Source
This commit is contained in:
Jonathan Kew 2015-04-09 08:41:49 +01:00
parent 803079473a
commit 376b12d54c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/generic/nsBlockReflowState.cpp
View File

@ -642,6 +642,8 @@ nsBlockReflowState::CanPlaceFloat(nscoord aFloatISize,
aFloatISize;
}
// Return the inline-size that the float (including margins) will take up
// in the writing mode of the containing block.
static nscoord
FloatMarginISize(const nsHTMLReflowState& aCBReflowState,
nscoord aFloatAvailableISize,
@ -663,9 +665,11 @@ FloatMarginISize(const nsHTMLReflowState& aCBReflowState,
aFloatOffsetState.ComputedLogicalPadding().Size(wm),
nsIFrame::ComputeSizeFlags::eShrinkWrap);
return floatSize.ISize(wm) +
aFloatOffsetState.ComputedLogicalMargin().IStartEnd(wm) +
aFloatOffsetState.ComputedLogicalBorderPadding().IStartEnd(wm);
floatSize += aFloatOffsetState.ComputedLogicalMargin().Size(wm);
floatSize += aFloatOffsetState.ComputedLogicalBorderPadding().Size(wm);
WritingMode cbwm = aCBReflowState.GetWritingMode();
return floatSize.ConvertTo(cbwm, wm).ISize(cbwm);
}
bool