mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1107721 - Move BeginSpan down for attaching annotation containers to the base container. r=dbaron
--HG-- extra : source : 40b7661585537768ccc5bbac9c99ff70713815c9 extra : histedit_source : d9cd1403ce80c070fc3e3a1d66f9e9114bc0f1e3
This commit is contained in:
parent
83bce325f6
commit
3672bdd40e
@ -273,14 +273,6 @@ nsRubyBaseContainerFrame::Reflow(nsPresContext* aPresContext,
|
||||
|
||||
aStatus = NS_FRAME_COMPLETE;
|
||||
WritingMode lineWM = aReflowState.mLineLayout->GetWritingMode();
|
||||
WritingMode frameWM = aReflowState.GetWritingMode();
|
||||
LogicalMargin borderPadding = aReflowState.ComputedLogicalBorderPadding();
|
||||
nscoord startEdge = borderPadding.IStart(frameWM);
|
||||
nscoord endEdge = aReflowState.AvailableISize() - borderPadding.IEnd(frameWM);
|
||||
|
||||
aReflowState.mLineLayout->BeginSpan(this, &aReflowState,
|
||||
startEdge, endEdge, &mBaseline);
|
||||
|
||||
LogicalSize availSize(lineWM, aReflowState.AvailableWidth(),
|
||||
aReflowState.AvailableHeight());
|
||||
|
||||
@ -339,6 +331,13 @@ nsRubyBaseContainerFrame::Reflow(nsPresContext* aPresContext,
|
||||
false, false, lineWM, containerWidth);
|
||||
}
|
||||
|
||||
WritingMode frameWM = aReflowState.GetWritingMode();
|
||||
LogicalMargin borderPadding = aReflowState.ComputedLogicalBorderPadding();
|
||||
nscoord startEdge = borderPadding.IStart(frameWM);
|
||||
nscoord endEdge = aReflowState.AvailableISize() - borderPadding.IEnd(frameWM);
|
||||
aReflowState.mLineLayout->BeginSpan(this, &aReflowState,
|
||||
startEdge, endEdge, &mBaseline);
|
||||
|
||||
// Reflow pairs excluding any span
|
||||
nscoord pairsISize = ReflowPairs(aPresContext, aReflowState,
|
||||
rtcReflowStates, aStatus);
|
||||
|
Loading…
Reference in New Issue
Block a user