Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-10 17:24:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert part of the changes from bug 140611. Patch partly from Sander <svl_bmo@juima.org>. b=259683 r+sr=roc a=asa

Browse Source
This commit is contained in:
dbaron%dbaron.org 2004-10-23 23:23:43 +00:00
parent 3403b8df5f
commit fc211528b0
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layout/generic/nsLineLayout.cpp
View File

@ -2833,11 +2833,6 @@ nsLineLayout::HorizontalAlignFrames(nsRect& aLineBounds,
} }
#ifdef IBMBIDI #ifdef IBMBIDI
} }
// If we need to move the frames but we're shrink wrapping, then
// we need to wait until the final width is known
if (aShrinkWrapWidth) {
return PR_FALSE;
}
PRBool isRTL = ( (NS_STYLE_DIRECTION_RTL == psd->mDirection) PRBool isRTL = ( (NS_STYLE_DIRECTION_RTL == psd->mDirection)
&& (!psd->mChangedFrameDirection) ); && (!psd->mChangedFrameDirection) );
if (dx || isRTL) { if (dx || isRTL) {
@ -2853,15 +2848,16 @@ nsLineLayout::HorizontalAlignFrames(nsRect& aLineBounds,
isVisualRTL = mPresContext->IsVisualMode(); isVisualRTL = mPresContext->IsVisualMode();
} }
if (dx || isVisualRTL) { if (dx || isVisualRTL)
#else #else
if (0 != dx) { if (0 != dx)
#endif
{
// If we need to move the frames but we're shrink wrapping, then // If we need to move the frames but we're shrink wrapping, then
// we need to wait until the final width is known // we need to wait until the final width is known
if (aShrinkWrapWidth) { if (aShrinkWrapWidth) {
return PR_FALSE; return PR_FALSE;
} }
#endif
for (PerFrameData* pfd = psd->mFirstFrame; pfd for (PerFrameData* pfd = psd->mFirstFrame; pfd
#ifdef IBMBIDI #ifdef IBMBIDI
&& bulletPfd != pfd && bulletPfd != pfd

12
layout/html/base/src/nsLineLayout.cpp
View File

@ -2833,11 +2833,6 @@ nsLineLayout::HorizontalAlignFrames(nsRect& aLineBounds,
} }
#ifdef IBMBIDI #ifdef IBMBIDI
} }
// If we need to move the frames but we're shrink wrapping, then
// we need to wait until the final width is known
if (aShrinkWrapWidth) {
return PR_FALSE;
}
PRBool isRTL = ( (NS_STYLE_DIRECTION_RTL == psd->mDirection) PRBool isRTL = ( (NS_STYLE_DIRECTION_RTL == psd->mDirection)
&& (!psd->mChangedFrameDirection) ); && (!psd->mChangedFrameDirection) );
if (dx || isRTL) { if (dx || isRTL) {
@ -2853,15 +2848,16 @@ nsLineLayout::HorizontalAlignFrames(nsRect& aLineBounds,
isVisualRTL = mPresContext->IsVisualMode(); isVisualRTL = mPresContext->IsVisualMode();
} }
if (dx || isVisualRTL) { if (dx || isVisualRTL)
#else #else
if (0 != dx) { if (0 != dx)
#endif
{
// If we need to move the frames but we're shrink wrapping, then // If we need to move the frames but we're shrink wrapping, then
// we need to wait until the final width is known // we need to wait until the final width is known
if (aShrinkWrapWidth) { if (aShrinkWrapWidth) {
return PR_FALSE; return PR_FALSE;
} }
#endif
for (PerFrameData* pfd = psd->mFirstFrame; pfd for (PerFrameData* pfd = psd->mFirstFrame; pfd
#ifdef IBMBIDI #ifdef IBMBIDI
&& bulletPfd != pfd && bulletPfd != pfd