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

Bug 1044198: convert margins from the frame's writing mode to the line's writing mode in nsBidiPresUtils::RepositionInlineFrames, r=jfkthame.

Browse Source
This commit is contained in:
Simon Montagu 2014-07-28 01:20:58 -07:00
parent 161b33d5f5
commit b7f0fb4d8a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
layout/base/nsBidiPresUtils.cpp
View File

@ -1396,9 +1396,9 @@ nsBidiPresUtils::RepositionFrame(nsIFrame* aFrame,
// This method is called from nsBlockFrame::PlaceLine via the call to
// bidiUtils->ReorderFrames, so this is guaranteed to be after the inlines
// have been reflowed, which is required for GetUsedMargin/Border/Padding
LogicalMargin margin(frameWM, aFrame->GetUsedMargin());
LogicalMargin margin(aLineWM, aFrame->GetUsedMargin());
if (isFirst) {
aStart += margin.IStart(frameWM);
aStart += margin.IStart(aLineWM);
}
nscoord start = aStart;
@ -1457,7 +1457,7 @@ nsBidiPresUtils::RepositionFrame(nsIFrame* aFrame,
aFrame->SetRect(aLineWM, logicalRect, aLineWidth);
if (isLast) {
aStart += margin.IEnd(frameWM);
aStart += margin.IEnd(aLineWM);
}
}
@ -1492,11 +1492,10 @@ nsBidiPresUtils::RepositionInlineFrames(BidiLineData *aBld,
// This method is called from nsBlockFrame::PlaceLine via the call to
// bidiUtils->ReorderFrames, so this is guaranteed to be after the inlines
// have been reflowed, which is required for GetUsedMargin/Border/Padding
WritingMode frameWM = aFirstChild->GetWritingMode();
LogicalMargin margin(frameWM, aFirstChild->GetUsedMargin());
LogicalMargin margin(aLineWM, aFirstChild->GetUsedMargin());
if (!aFirstChild->GetPrevContinuation() &&
!aFirstChild->FrameIsNonFirstInIBSplit())
startSpace = margin.IStart(frameWM);
startSpace = margin.IStart(aLineWM);
nscoord start = LogicalRect(aLineWM, aFirstChild->GetRect(),
aLineWidth).IStart(aLineWM) - startSpace;