diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp index 57a98e87cd0..fe06ea177e7 100644 --- a/mozilla/layout/generic/nsLineLayout.cpp +++ b/mozilla/layout/generic/nsLineLayout.cpp @@ -1520,6 +1520,8 @@ nsLineLayout::AlignChildren() blockSC->GetData(eStyleStruct_Font); nsStyleText* blockText = (nsStyleText*) blockSC->GetData(eStyleStruct_Text); + nsStyleDisplay* blockDisplay = (nsStyleDisplay*) + blockSC->GetData(eStyleStruct_Display); // First vertically align the children on the line; this will // compute the actual line height for us. @@ -1531,7 +1533,9 @@ nsLineLayout::AlignChildren() mAscents, mState.mMaxAscent); // Now horizontally place the children - nsCSSLayout::HorizontallyPlaceChildren(mPresContext, mBlock, blockText, + nsCSSLayout::HorizontallyPlaceChildren(mPresContext, mBlock, + blockText->mTextAlign, + blockDisplay->mDirection, mLine->mFirstChild, mLine->mChildCount, mState.mX - mLeftEdge, diff --git a/mozilla/layout/html/base/src/nsLineLayout.cpp b/mozilla/layout/html/base/src/nsLineLayout.cpp index 57a98e87cd0..fe06ea177e7 100644 --- a/mozilla/layout/html/base/src/nsLineLayout.cpp +++ b/mozilla/layout/html/base/src/nsLineLayout.cpp @@ -1520,6 +1520,8 @@ nsLineLayout::AlignChildren() blockSC->GetData(eStyleStruct_Font); nsStyleText* blockText = (nsStyleText*) blockSC->GetData(eStyleStruct_Text); + nsStyleDisplay* blockDisplay = (nsStyleDisplay*) + blockSC->GetData(eStyleStruct_Display); // First vertically align the children on the line; this will // compute the actual line height for us. @@ -1531,7 +1533,9 @@ nsLineLayout::AlignChildren() mAscents, mState.mMaxAscent); // Now horizontally place the children - nsCSSLayout::HorizontallyPlaceChildren(mPresContext, mBlock, blockText, + nsCSSLayout::HorizontallyPlaceChildren(mPresContext, mBlock, + blockText->mTextAlign, + blockDisplay->mDirection, mLine->mFirstChild, mLine->mChildCount, mState.mX - mLeftEdge,