From f665472a1c79f518ec17239e0bb6dc12c378c44b Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Mon, 2 Feb 2015 18:29:52 +0000 Subject: [PATCH] Bug 1127679 - Fix use of incorrect writing mode in flex-item relative positioning. r=smontagu --- layout/generic/nsFlexContainerFrame.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp index 8f691749e11c..8e2cc2b9fe63 100644 --- a/layout/generic/nsFlexContainerFrame.cpp +++ b/layout/generic/nsFlexContainerFrame.cpp @@ -3885,7 +3885,11 @@ nsFlexContainerFrame::ReflowFlexItem(nsPresContext* aPresContext, "We gave flex item unconstrained available height, so it " "should be complete"); - childReflowState.ApplyRelativePositioning(&aFramePos, aContainerWidth); + LogicalMargin offsets = + childReflowState.ComputedLogicalOffsets().ConvertTo(outerWM, wm); + nsHTMLReflowState::ApplyRelativePositioning(aItem.Frame(), outerWM, + offsets, &aFramePos, + aContainerWidth); FinishReflowChild(aItem.Frame(), aPresContext, childDesiredSize, &childReflowState,