From 79a30d7b05d0b4e67f500d1bb1f2d4612554b206 Mon Sep 17 00:00:00 2001 From: "roc+%cs.cmu.edu" Date: Tue, 24 Jul 2007 03:48:10 +0000 Subject: [PATCH] Bug 385270. Remove unnecessary (hopefully) bidi offset adjustment; the offsets will get fixed by a later reflow. r+sr=dbaron git-svn-id: svn://10.0.0.236/trunk@230729 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsLineLayout.cpp | 28 ------------------------- 1 file changed, 28 deletions(-) diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp index bf25ff565fe..ffe043488df 100644 --- a/mozilla/layout/generic/nsLineLayout.cpp +++ b/mozilla/layout/generic/nsLineLayout.cpp @@ -883,16 +883,6 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame, nscoord ty = y - psd->mReflowState->mComputedBorderPadding.top; mSpaceManager->Translate(tx, ty); -#ifdef IBMBIDI - PRInt32 start, end; - - if (mPresContext->BidiEnabled()) { - if (aFrame->GetStateBits() & NS_FRAME_IS_BIDI) { - aFrame->GetOffsets(start, end); - } - } -#endif // IBMBIDI - nsIAtom* frameType = aFrame->GetType(); PRInt32 savedOptionalBreakOffset; nsIContent* savedOptionalBreakContent = @@ -1086,24 +1076,6 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame, printf(" status=%x\n", aReflowStatus); #endif - if (aFrame->GetStateBits() & NS_FRAME_IS_BIDI) { - // Since aReflowStatus may change, check it at the end - if (NS_INLINE_IS_BREAK_BEFORE(aReflowStatus) ) { - aFrame->AdjustOffsetsForBidi(start, end); - } - else if (!NS_FRAME_IS_COMPLETE(aReflowStatus) ) { - PRInt32 newEnd; - aFrame->GetOffsets(start, newEnd); - if (newEnd != end) { - nsIFrame* nextInFlow = aFrame->GetNextInFlow(); - if (nextInFlow) { - nextInFlow->GetOffsets(start, end); - nextInFlow->AdjustOffsetsForBidi(newEnd, end); - } // nextInFlow - } // newEnd != end - } // !NS_FRAME_IS_COMPLETE(aReflowStatus) - } // isBidiFrame - return rv; }