Bug 842142 - Prevent odd text wrapping in SVG text. r=roc

This commit is contained in:
Cameron McCormack
2013-03-25 14:50:59 +11:00
parent 4940a187d4
commit 3e1ca6bed4
7 changed files with 31 additions and 12 deletions

View File

@@ -205,7 +205,7 @@ nsLineLayout::BeginLineReflow(nscoord aX, nscoord aY,
mTopEdge = aY;
psd->mNoWrap = !mStyleText->WhiteSpaceCanWrap();
psd->mNoWrap = !mStyleText->WhiteSpaceCanWrap(GetLineContainerFrame());
psd->mDirection = aDirection;
psd->mChangedFrameDirection = false;
@@ -407,7 +407,8 @@ nsLineLayout::BeginSpan(nsIFrame* aFrame,
psd->mRightEdge = aRightEdge;
psd->mBaseline = aBaseline;
psd->mNoWrap = !aSpanReflowState->frame->StyleText()->WhiteSpaceCanWrap();
nsIFrame* frame = aSpanReflowState->frame;
psd->mNoWrap = !frame->StyleText()->WhiteSpaceCanWrap(frame);
psd->mDirection = aSpanReflowState->mStyleVisibility->mDirection;
psd->mChangedFrameDirection = false;