wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't propagate line layout in reflow state when we're not in the line. b=320502 r+sr=roc

Browse Source
This commit is contained in:
dbaron@dbaron.org 2007-05-17 23:04:04 -07:00
parent 4fdff9f2af
commit 93042a4e45
8 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/generic/nsBRFrame.cpp
View File

@ -84,7 +84,8 @@ public:
virtual PRBool IsFrameOfType(PRUint32 aFlags) const
{
return nsFrame::IsFrameOfType(aFlags & ~(nsIFrame::eReplaced));
return nsFrame::IsFrameOfType(aFlags & ~(nsIFrame::eReplaced |
nsIFrame::eLineParticipant));
}
#ifdef ACCESSIBILITY

1
layout/generic/nsBlockReflowContext.cpp
View File

@ -277,7 +277,6 @@ nsBlockReflowContext::ReflowBlock(const nsRect& aSpace,
}
}
aFrameRS.mLineLayout = nsnull;
if (!aIsAdjacentWithTop) {
aFrameRS.mFlags.mIsTopOfPage = PR_FALSE; // make sure this is cleared
}

2
layout/generic/nsFirstLetterFrame.cpp
View File

@ -66,6 +66,8 @@ public:
virtual PRBool IsFrameOfType(PRUint32 aFlags) const
{
if (!GetStyleDisplay()->IsFloating())
aFlags = aFlags & ~(nsIFrame::eLineParticipant);
return nsFirstLetterFrameSuper::IsFrameOfType(aFlags &
~(nsIFrame::eBidiInlineContainer));
}

5
layout/generic/nsHTMLReflowState.cpp
View File

@ -158,7 +158,10 @@ nsHTMLReflowState::nsHTMLReflowState(nsPresContext* aPresContext,
availableHeight = aAvailableSpace.height;
mSpaceManager = aParentReflowState.mSpaceManager;
mLineLayout = aParentReflowState.mLineLayout;
if (frame->IsFrameOfType(nsIFrame::eLineParticipant))
mLineLayout = aParentReflowState.mLineLayout;
else
mLineLayout = nsnull;
mFlags.mIsTopOfPage = aParentReflowState.mFlags.mIsTopOfPage;
mFlags.mNextInFlowUntouched = aParentReflowState.mFlags.mNextInFlowUntouched &&
CheckNextInFlowParenthood(aFrame, aParentReflowState.frame);

3
layout/generic/nsIFrame.h
View File

@ -1435,6 +1435,9 @@ public:
// Frame that contains a block but looks like a replaced element
// from the outside
eReplacedContainsBlock = 1 << 5,
// A frame that participates in inline reflow, i.e., one that
// requires nsHTMLReflowState::mLineLayout.
eLineParticipant = 1 << 6,
// These are to allow nsFrame::Init to assert that IsFrameOfType

2
layout/generic/nsInlineFrame.h
View File

@ -103,7 +103,7 @@ public:
virtual PRBool IsFrameOfType(PRUint32 aFlags) const
{
return nsInlineFrameSuper::IsFrameOfType(aFlags &
~(nsIFrame::eBidiInlineContainer));
~(nsIFrame::eBidiInlineContainer | nsIFrame::eLineParticipant));
}
virtual PRBool IsEmpty();

3
layout/generic/nsTextFrame.cpp
View File

@ -331,7 +331,8 @@ public:
{
// Set the frame state bit for text frames to mark them as replaced.
// XXX kipp: temporary
return nsFrame::IsFrameOfType(aFlags & ~(nsIFrame::eReplaced));
return nsFrame::IsFrameOfType(aFlags & ~(nsIFrame::eReplaced |
nsIFrame::eLineParticipant));
}
#ifdef DEBUG

3
layout/generic/nsTextFrameThebes.cpp
View File

@ -374,7 +374,8 @@ public:
{
// Set the frame state bit for text frames to mark them as replaced.
// XXX kipp: temporary
return nsFrame::IsFrameOfType(aFlags & ~(nsIFrame::eReplaced));
return nsFrame::IsFrameOfType(aFlags & ~(nsIFrame::eReplaced |
nsIFrame::eLineParticipant));
}
#ifdef DEBUG