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

Only do state-recovery update of nsBlockReflowState::mPrevChild on the transition from a line we don't reflow to a line we do reflow. b=111676 r=attinasi sr=hyatt

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@109773 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%fas.harvard.edu 2001-12-06 00:30:06 +00:00
parent bbfe427ba4
commit 3be8570947
4 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2063,7 +2063,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
// whether we did NOT reflow the previous line and thus we need to
// recompute the carried out margin before the line if we want to
// reflow it or if its previous margin is dirty
PRBool needToRecoverMargin = PR_FALSE;
PRBool needToRecoverState = PR_FALSE;
// Reflow the lines that are already ours
line_iterator line = begin_lines(), line_end = end_lines();
@ -2096,13 +2096,12 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
// Make sure |aState.mPrevBottomMargin| is at the correct position
// before calling PropagateFloaterDamage.
if (needToRecoverMargin) {
needToRecoverMargin = PR_FALSE;
if (needToRecoverState &&
(line->IsDirty() || line->IsPreviousMarginDirty())) {
// We need to reconstruct the bottom margin only if we didn't
// reflow the previous line and we do need to reflow (or repair
// the top position of) the next line.
if (line->IsDirty() || line->IsPreviousMarginDirty())
aState.ReconstructMarginAbove(line);
aState.ReconstructMarginAbove(line);
}
if (line->IsPreviousMarginDirty() && !line->IsDirty()) {
@ -2129,6 +2128,16 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
PropagateFloaterDamage(aState, line, deltaY);
}
if (needToRecoverState) {
needToRecoverState = PR_FALSE;
// Update aState.mPrevChild as if we had reflowed all of the frames in
// this line. This is expensive in some cases, since it requires
// walking |GetNextSibling|.
if (line->IsDirty())
aState.mPrevChild = line.prev()->LastChild();
}
// Now repair the line and update |aState.mY| by calling
// |ReflowLine| or |SlideLine|.
if (line->IsDirty()) {
@ -2185,7 +2194,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
// Keep mY up to date in case we're propagating reflow damage.
aState.mY = line->mBounds.YMost();
needToRecoverMargin = PR_TRUE;
needToRecoverState = PR_TRUE;
}
#ifdef DEBUG
@ -2204,9 +2213,14 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
#endif
}
if (needToRecoverMargin) {
if (needToRecoverState) {
// Is this expensive?
aState.ReconstructMarginAbove(line);
// Update aState.mPrevChild as if we had reflowed all of the frames in
// this line. This is expensive in some cases, since it requires
// walking |GetNextSibling|.
aState.mPrevChild = line.prev()->LastChild();
}
// Should we really have to do this?

6
mozilla/layout/generic/nsBlockReflowState.cpp
View File

@ -543,12 +543,6 @@ nsBlockReflowState::RecoverStateFrom(nsLineList::iterator aLine,
// Make the line being recovered the current line
mCurrentLine = aLine;
// Update aState.mPrevChild as if we had reflowed all of the frames
// in this line.
// XXXldb This is expensive in some cases, since it requires walking
// |GetNextSibling|.
mPrevChild = aLine->LastChild();
// Recover mKidXMost and mMaxElementSize
nscoord xmost = aLine->mBounds.XMost();
if (xmost > mKidXMost) {

28
mozilla/layout/html/base/src/nsBlockFrame.cpp
View File

@ -2063,7 +2063,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
// whether we did NOT reflow the previous line and thus we need to
// recompute the carried out margin before the line if we want to
// reflow it or if its previous margin is dirty
PRBool needToRecoverMargin = PR_FALSE;
PRBool needToRecoverState = PR_FALSE;
// Reflow the lines that are already ours
line_iterator line = begin_lines(), line_end = end_lines();
@ -2096,13 +2096,12 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
// Make sure |aState.mPrevBottomMargin| is at the correct position
// before calling PropagateFloaterDamage.
if (needToRecoverMargin) {
needToRecoverMargin = PR_FALSE;
if (needToRecoverState &&
(line->IsDirty() || line->IsPreviousMarginDirty())) {
// We need to reconstruct the bottom margin only if we didn't
// reflow the previous line and we do need to reflow (or repair
// the top position of) the next line.
if (line->IsDirty() || line->IsPreviousMarginDirty())
aState.ReconstructMarginAbove(line);
aState.ReconstructMarginAbove(line);
}
if (line->IsPreviousMarginDirty() && !line->IsDirty()) {
@ -2129,6 +2128,16 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
PropagateFloaterDamage(aState, line, deltaY);
}
if (needToRecoverState) {
needToRecoverState = PR_FALSE;
// Update aState.mPrevChild as if we had reflowed all of the frames in
// this line. This is expensive in some cases, since it requires
// walking |GetNextSibling|.
if (line->IsDirty())
aState.mPrevChild = line.prev()->LastChild();
}
// Now repair the line and update |aState.mY| by calling
// |ReflowLine| or |SlideLine|.
if (line->IsDirty()) {
@ -2185,7 +2194,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
// Keep mY up to date in case we're propagating reflow damage.
aState.mY = line->mBounds.YMost();
needToRecoverMargin = PR_TRUE;
needToRecoverState = PR_TRUE;
}
#ifdef DEBUG
@ -2204,9 +2213,14 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
#endif
}
if (needToRecoverMargin) {
if (needToRecoverState) {
// Is this expensive?
aState.ReconstructMarginAbove(line);
// Update aState.mPrevChild as if we had reflowed all of the frames in
// this line. This is expensive in some cases, since it requires
// walking |GetNextSibling|.
aState.mPrevChild = line.prev()->LastChild();
}
// Should we really have to do this?

6
mozilla/layout/html/base/src/nsBlockReflowState.cpp
View File

@ -543,12 +543,6 @@ nsBlockReflowState::RecoverStateFrom(nsLineList::iterator aLine,
// Make the line being recovered the current line
mCurrentLine = aLine;
// Update aState.mPrevChild as if we had reflowed all of the frames
// in this line.
// XXXldb This is expensive in some cases, since it requires walking
// |GetNextSibling|.
mPrevChild = aLine->LastChild();
// Recover mKidXMost and mMaxElementSize
nscoord xmost = aLine->mBounds.XMost();
if (xmost > mKidXMost) {