Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final fix for bug 263581 -- pre-dirty wrapped lines with dirty continuations,

Browse Source 
if needed, before entering the loop over lines.  r+sr=roc


git-svn-id: svn://10.0.0.236/trunk@165906 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2004-11-29 22:02:11 +00:00
parent 86d97662d4
commit 18b7766c94
2 changed files with 50 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
mozilla/layout/generic/nsBlockFrame.cpp
View File

@@ -1975,34 +1975,25 @@ nsBlockFrame::PropagateFloatDamage(nsBlockReflowState& aState,
}
static void
DirtyLineIfWrappedLinesAreDirty(const nsLineList::iterator& aLine,
const nsLineList::iterator& aLineEnd)
DirtyLinesWithDirtyContinuations(const nsLineList::iterator& aLineStart,
const nsLineList::iterator& aLineEnd)
{
NS_PRECONDITION(!aLine->IsDirty(), "Must pass in clean line");
if (aLine->IsInline() && aLine->IsLineWrapped()) {
nsLineList::iterator line(aLine);
PRBool hasDirtyContinuation = PR_FALSE;
do {
++line;
if (line == aLineEnd) {
break;
}
// The line we're looking at right now
line_iterator line(aLineEnd);
NS_ASSERTION(!line->IsBlock(), "didn't expect a block line");
if (line->IsDirty()) {
// we found a continuing line that is dirty
hasDirtyContinuation = PR_TRUE;
break;
}
} while (line->IsLineWrapped());
if (hasDirtyContinuation) {
// Mark all lines between aLine and line dirty
do {
--line;
line->MarkDirty();
} while (line != aLine);
// Whether the line following the current one is dirty
PRBool nextLineDirty = PR_FALSE;
while (line != aLineStart) {
--line;
if (nextLineDirty && line->IsInline() && line->IsLineWrapped()) {
line->MarkDirty();
// Note that nextLineDirty is already true and |line| will be the "next
// line" next time through this loop, and we just marked it dirty, so
// just leave nextLineDirty as true.
} else {
nextLineDirty = line->IsDirty();
}
}
}
@@ -2113,8 +2104,15 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
// We save up information about BR-clearance here
PRUint8 inlineFloatBreakType = NS_STYLE_CLEAR_NONE;
// Reflow the lines that are already ours
line_iterator line = begin_lines(), line_end = end_lines();
// If we're supposed to update our maximum width, then we'll also need to
// reflow any line if it's line wrapped and has a dirty continuing line.
if (aState.GetFlag(BRS_COMPUTEMAXWIDTH)) {
::DirtyLinesWithDirtyContinuations(line, line_end);
}
// Reflow the lines that are already ours
for ( ; line != line_end; ++line, aState.AdvanceToNextLine()) {
#ifdef DEBUG
if (gNoisyReflow) {
@@ -2131,17 +2129,6 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
}
#endif
// If we're supposed to update our maximum width, then we'll also need to
// reflow this line if it's line wrapped and any of the continuing lines
// are dirty.
if (!line->IsDirty() &&
aState.GetFlag(BRS_COMPUTEMAXWIDTH)) {
// Check whether we need to dirty this line by looking for a dirty
// continuation. If we find one, mark this line and all lines up to that
// continuation dirty.
::DirtyLineIfWrappedLinesAreDirty(line, line_end);
}
// This really sucks, but we have to look inside any blocks that have clear
// elements inside them.
// XXX what can we do smarter here?