mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

b=36202 Patch from roc+moz@cs.cmu.edu that makes sure we invalidate if 

necessary when pulling up frames
This commit is contained in:
troy%netscape.com 2000-04-19 03:12:13 +00:00
Родитель 96035dd22a
Коммит a8143dd431
8 изменённых файлов: 156 добавлений и 84 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

36
layout/generic/nsBlockFrame.cpp
Просмотреть файл

@ -3017,7 +3017,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
// associated floater we don't end up resetting the line's right edge and // associated floater we don't end up resetting the line's right edge and
// have it think the width is unconstrained... // have it think the width is unconstrained...
aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, PR_TRUE); aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, PR_TRUE);
ReflowInlineFrames(aState, aLine, aKeepReflowGoing, PR_TRUE); ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea, PR_TRUE);
aState.mY = oldY; aState.mY = oldY;
aState.mPrevBottomMargin = oldPrevBottomMargin; aState.mPrevBottomMargin = oldPrevBottomMargin;
aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, oldUnconstrainedWidth); aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, oldUnconstrainedWidth);
@ -3040,12 +3040,12 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, PR_FALSE); aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, PR_FALSE);
aState.SetFlag(BRS_COMPUTEMAXWIDTH, PR_FALSE); aState.SetFlag(BRS_COMPUTEMAXWIDTH, PR_FALSE);
rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing); rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea);
aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, oldComputeMaxElementSize); aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, oldComputeMaxElementSize);
aState.SetFlag(BRS_COMPUTEMAXWIDTH, oldComputeMaximumWidth); aState.SetFlag(BRS_COMPUTEMAXWIDTH, oldComputeMaximumWidth);
} else { } else {
rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing); rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea);
} }
// We don't really know what changed in the line, so use the union // We don't really know what changed in the line, so use the union
@ -3074,6 +3074,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
nsresult nsresult
nsBlockFrame::PullFrame(nsBlockReflowState& aState, nsBlockFrame::PullFrame(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool aDamageDeletedLines,
nsIFrame*& aFrameResult) nsIFrame*& aFrameResult)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -3082,7 +3083,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
// First check our remaining lines // First check our remaining lines
while (nsnull != aLine->mNext) { while (nsnull != aLine->mNext) {
rv = PullFrame(aState, aLine, &aLine->mNext, PR_FALSE, rv = PullFrame(aState, aLine, &aLine->mNext, PR_FALSE, aDamageDeletedLines,
aFrameResult, stopPulling); aFrameResult, stopPulling);
if (NS_FAILED(rv) || stopPulling) { if (NS_FAILED(rv) || stopPulling) {
return rv; return rv;
@ -3098,7 +3099,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
aState.mNextInFlow = nextInFlow; aState.mNextInFlow = nextInFlow;
continue; continue;
} }
rv = PullFrame(aState, aLine, &nextInFlow->mLines, PR_TRUE, rv = PullFrame(aState, aLine, &nextInFlow->mLines, PR_TRUE, aDamageDeletedLines,
aFrameResult, stopPulling); aFrameResult, stopPulling);
if (NS_FAILED(rv) || stopPulling) { if (NS_FAILED(rv) || stopPulling) {
return rv; return rv;
@ -3126,6 +3127,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
nsLineBox** aFromList, nsLineBox** aFromList,
PRBool aUpdateGeometricParent, PRBool aUpdateGeometricParent,
PRBool aDamageDeletedLines,
nsIFrame*& aFrameResult, nsIFrame*& aFrameResult,
PRBool& aStopPulling) PRBool& aStopPulling)
{ {
@ -3155,6 +3157,10 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
} }
else { else {
// Free up the fromLine now that it's empty // Free up the fromLine now that it's empty
// Its bounds might need to be redrawn, though.
if (aDamageDeletedLines) {
Invalidate(aState.mPresContext, fromLine->mBounds);
}
*aFromList = fromLine->mNext; *aFromList = fromLine->mNext;
aState.FreeLineBox(fromLine); aState.FreeLineBox(fromLine);
} }
@ -3860,6 +3866,7 @@ nsresult
nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState, nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRBool aDamageDirtyArea,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -3876,12 +3883,12 @@ nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState,
if (aState.mReflowState.mReflowDepth > 30) {//XXX layout-tune.h? if (aState.mReflowState.mReflowDepth > 30) {//XXX layout-tune.h?
rv = DoReflowInlineFramesMalloc(aState, aLine, aKeepReflowGoing, rv = DoReflowInlineFramesMalloc(aState, aLine, aKeepReflowGoing,
&lineReflowStatus, &lineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
} }
else { else {
rv = DoReflowInlineFramesAuto(aState, aLine, aKeepReflowGoing, rv = DoReflowInlineFramesAuto(aState, aLine, aKeepReflowGoing,
&lineReflowStatus, &lineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
} }
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
break; break;
@ -3903,7 +3910,8 @@ nsBlockFrame::DoReflowInlineFramesMalloc(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
nsLineLayout* ll = new nsLineLayout(aState.mPresContext, nsLineLayout* ll = new nsLineLayout(aState.mPresContext,
aState.mReflowState.mSpaceManager, aState.mReflowState.mSpaceManager,
@ -3915,7 +3923,7 @@ nsBlockFrame::DoReflowInlineFramesMalloc(nsBlockReflowState& aState,
ll->Init(&aState, aState.mMinLineHeight, aState.mLineNumber); ll->Init(&aState, aState.mMinLineHeight, aState.mLineNumber);
ll->SetReflowTextRuns(mTextRuns); ll->SetReflowTextRuns(mTextRuns);
nsresult rv = DoReflowInlineFrames(aState, *ll, aLine, aKeepReflowGoing, nsresult rv = DoReflowInlineFrames(aState, *ll, aLine, aKeepReflowGoing,
aLineReflowStatus, aUpdateMaximumWidth); aLineReflowStatus, aUpdateMaximumWidth, aDamageDirtyArea);
ll->EndLineReflow(); ll->EndLineReflow();
delete ll; delete ll;
return rv; return rv;
@ -3926,7 +3934,8 @@ nsBlockFrame::DoReflowInlineFramesAuto(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
nsLineLayout lineLayout(aState.mPresContext, nsLineLayout lineLayout(aState.mPresContext,
aState.mReflowState.mSpaceManager, aState.mReflowState.mSpaceManager,
@ -3936,7 +3945,7 @@ nsBlockFrame::DoReflowInlineFramesAuto(nsBlockReflowState& aState,
lineLayout.SetReflowTextRuns(mTextRuns); lineLayout.SetReflowTextRuns(mTextRuns);
nsresult rv = DoReflowInlineFrames(aState, lineLayout, aLine, nsresult rv = DoReflowInlineFrames(aState, lineLayout, aLine,
aKeepReflowGoing, aLineReflowStatus, aKeepReflowGoing, aLineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
lineLayout.EndLineReflow(); lineLayout.EndLineReflow();
return rv; return rv;
} }
@ -3947,7 +3956,8 @@ nsBlockFrame::DoReflowInlineFrames(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
// Forget all of the floaters on the line // Forget all of the floaters on the line
aLine->FreeFloaters(aState.mFloaterCacheFreeList); aLine->FreeFloaters(aState.mFloaterCacheFreeList);
@ -4023,7 +4033,7 @@ nsBlockFrame::DoReflowInlineFrames(nsBlockReflowState& aState,
// Pull frames and reflow them until we can't // Pull frames and reflow them until we can't
while (LINE_REFLOW_OK == lineReflowStatus) { while (LINE_REFLOW_OK == lineReflowStatus) {
rv = PullFrame(aState, aLine, frame); rv = PullFrame(aState, aLine, aDamageDirtyArea, frame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
} }

12
layout/generic/nsBlockFrame.h
Просмотреть файл

@ -290,6 +290,7 @@ protected:
nsresult ReflowInlineFrames(nsBlockReflowState& aState, nsresult ReflowInlineFrames(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepLineGoing, PRBool* aKeepLineGoing,
PRBool aDamageDirtyArea,
PRBool aUpdateMaximumWidth = PR_FALSE); PRBool aUpdateMaximumWidth = PR_FALSE);
nsresult DoReflowInlineFrames(nsBlockReflowState& aState, nsresult DoReflowInlineFrames(nsBlockReflowState& aState,
@ -297,19 +298,22 @@ protected:
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth); PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea);
nsresult DoReflowInlineFramesAuto(nsBlockReflowState& aState, nsresult DoReflowInlineFramesAuto(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth); PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea);
nsresult DoReflowInlineFramesMalloc(nsBlockReflowState& aState, nsresult DoReflowInlineFramesMalloc(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth); PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea);
nsresult ReflowInlineFrame(nsBlockReflowState& aState, nsresult ReflowInlineFrame(nsBlockReflowState& aState,
nsLineLayout& aLineLayout, nsLineLayout& aLineLayout,
@ -340,12 +344,14 @@ protected:
nsresult PullFrame(nsBlockReflowState& aState, nsresult PullFrame(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool aDamageDeletedLine,
nsIFrame*& aFrameResult); nsIFrame*& aFrameResult);
nsresult PullFrame(nsBlockReflowState& aState, nsresult PullFrame(nsBlockReflowState& aState,
nsLineBox* aToLine, nsLineBox* aToLine,
nsLineBox** aFromList, nsLineBox** aFromList,
PRBool aUpdateGeometricParent, PRBool aUpdateGeometricParent,
PRBool aDamageDeletedLines,
nsIFrame*& aFrameResult, nsIFrame*& aFrameResult,
PRBool& aStopPulling); PRBool& aStopPulling);

36
layout/generic/nsBlockReflowState.cpp
Просмотреть файл

@ -3017,7 +3017,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
// associated floater we don't end up resetting the line's right edge and // associated floater we don't end up resetting the line's right edge and
// have it think the width is unconstrained... // have it think the width is unconstrained...
aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, PR_TRUE); aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, PR_TRUE);
ReflowInlineFrames(aState, aLine, aKeepReflowGoing, PR_TRUE); ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea, PR_TRUE);
aState.mY = oldY; aState.mY = oldY;
aState.mPrevBottomMargin = oldPrevBottomMargin; aState.mPrevBottomMargin = oldPrevBottomMargin;
aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, oldUnconstrainedWidth); aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, oldUnconstrainedWidth);
@ -3040,12 +3040,12 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, PR_FALSE); aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, PR_FALSE);
aState.SetFlag(BRS_COMPUTEMAXWIDTH, PR_FALSE); aState.SetFlag(BRS_COMPUTEMAXWIDTH, PR_FALSE);
rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing); rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea);
aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, oldComputeMaxElementSize); aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, oldComputeMaxElementSize);
aState.SetFlag(BRS_COMPUTEMAXWIDTH, oldComputeMaximumWidth); aState.SetFlag(BRS_COMPUTEMAXWIDTH, oldComputeMaximumWidth);
} else { } else {
rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing); rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea);
} }
// We don't really know what changed in the line, so use the union // We don't really know what changed in the line, so use the union
@ -3074,6 +3074,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
nsresult nsresult
nsBlockFrame::PullFrame(nsBlockReflowState& aState, nsBlockFrame::PullFrame(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool aDamageDeletedLines,
nsIFrame*& aFrameResult) nsIFrame*& aFrameResult)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -3082,7 +3083,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
// First check our remaining lines // First check our remaining lines
while (nsnull != aLine->mNext) { while (nsnull != aLine->mNext) {
rv = PullFrame(aState, aLine, &aLine->mNext, PR_FALSE, rv = PullFrame(aState, aLine, &aLine->mNext, PR_FALSE, aDamageDeletedLines,
aFrameResult, stopPulling); aFrameResult, stopPulling);
if (NS_FAILED(rv) || stopPulling) { if (NS_FAILED(rv) || stopPulling) {
return rv; return rv;
@ -3098,7 +3099,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
aState.mNextInFlow = nextInFlow; aState.mNextInFlow = nextInFlow;
continue; continue;
} }
rv = PullFrame(aState, aLine, &nextInFlow->mLines, PR_TRUE, rv = PullFrame(aState, aLine, &nextInFlow->mLines, PR_TRUE, aDamageDeletedLines,
aFrameResult, stopPulling); aFrameResult, stopPulling);
if (NS_FAILED(rv) || stopPulling) { if (NS_FAILED(rv) || stopPulling) {
return rv; return rv;
@ -3126,6 +3127,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
nsLineBox** aFromList, nsLineBox** aFromList,
PRBool aUpdateGeometricParent, PRBool aUpdateGeometricParent,
PRBool aDamageDeletedLines,
nsIFrame*& aFrameResult, nsIFrame*& aFrameResult,
PRBool& aStopPulling) PRBool& aStopPulling)
{ {
@ -3155,6 +3157,10 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
} }
else { else {
// Free up the fromLine now that it's empty // Free up the fromLine now that it's empty
// Its bounds might need to be redrawn, though.
if (aDamageDeletedLines) {
Invalidate(aState.mPresContext, fromLine->mBounds);
}
*aFromList = fromLine->mNext; *aFromList = fromLine->mNext;
aState.FreeLineBox(fromLine); aState.FreeLineBox(fromLine);
} }
@ -3860,6 +3866,7 @@ nsresult
nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState, nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRBool aDamageDirtyArea,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -3876,12 +3883,12 @@ nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState,
if (aState.mReflowState.mReflowDepth > 30) {//XXX layout-tune.h? if (aState.mReflowState.mReflowDepth > 30) {//XXX layout-tune.h?
rv = DoReflowInlineFramesMalloc(aState, aLine, aKeepReflowGoing, rv = DoReflowInlineFramesMalloc(aState, aLine, aKeepReflowGoing,
&lineReflowStatus, &lineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
} }
else { else {
rv = DoReflowInlineFramesAuto(aState, aLine, aKeepReflowGoing, rv = DoReflowInlineFramesAuto(aState, aLine, aKeepReflowGoing,
&lineReflowStatus, &lineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
} }
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
break; break;
@ -3903,7 +3910,8 @@ nsBlockFrame::DoReflowInlineFramesMalloc(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
nsLineLayout* ll = new nsLineLayout(aState.mPresContext, nsLineLayout* ll = new nsLineLayout(aState.mPresContext,
aState.mReflowState.mSpaceManager, aState.mReflowState.mSpaceManager,
@ -3915,7 +3923,7 @@ nsBlockFrame::DoReflowInlineFramesMalloc(nsBlockReflowState& aState,
ll->Init(&aState, aState.mMinLineHeight, aState.mLineNumber); ll->Init(&aState, aState.mMinLineHeight, aState.mLineNumber);
ll->SetReflowTextRuns(mTextRuns); ll->SetReflowTextRuns(mTextRuns);
nsresult rv = DoReflowInlineFrames(aState, *ll, aLine, aKeepReflowGoing, nsresult rv = DoReflowInlineFrames(aState, *ll, aLine, aKeepReflowGoing,
aLineReflowStatus, aUpdateMaximumWidth); aLineReflowStatus, aUpdateMaximumWidth, aDamageDirtyArea);
ll->EndLineReflow(); ll->EndLineReflow();
delete ll; delete ll;
return rv; return rv;
@ -3926,7 +3934,8 @@ nsBlockFrame::DoReflowInlineFramesAuto(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
nsLineLayout lineLayout(aState.mPresContext, nsLineLayout lineLayout(aState.mPresContext,
aState.mReflowState.mSpaceManager, aState.mReflowState.mSpaceManager,
@ -3936,7 +3945,7 @@ nsBlockFrame::DoReflowInlineFramesAuto(nsBlockReflowState& aState,
lineLayout.SetReflowTextRuns(mTextRuns); lineLayout.SetReflowTextRuns(mTextRuns);
nsresult rv = DoReflowInlineFrames(aState, lineLayout, aLine, nsresult rv = DoReflowInlineFrames(aState, lineLayout, aLine,
aKeepReflowGoing, aLineReflowStatus, aKeepReflowGoing, aLineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
lineLayout.EndLineReflow(); lineLayout.EndLineReflow();
return rv; return rv;
} }
@ -3947,7 +3956,8 @@ nsBlockFrame::DoReflowInlineFrames(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
// Forget all of the floaters on the line // Forget all of the floaters on the line
aLine->FreeFloaters(aState.mFloaterCacheFreeList); aLine->FreeFloaters(aState.mFloaterCacheFreeList);
@ -4023,7 +4033,7 @@ nsBlockFrame::DoReflowInlineFrames(nsBlockReflowState& aState,
// Pull frames and reflow them until we can't // Pull frames and reflow them until we can't
while (LINE_REFLOW_OK == lineReflowStatus) { while (LINE_REFLOW_OK == lineReflowStatus) {
rv = PullFrame(aState, aLine, frame); rv = PullFrame(aState, aLine, aDamageDirtyArea, frame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
} }

36
layout/generic/nsBlockReflowState.h
Просмотреть файл

@ -3017,7 +3017,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
// associated floater we don't end up resetting the line's right edge and // associated floater we don't end up resetting the line's right edge and
// have it think the width is unconstrained... // have it think the width is unconstrained...
aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, PR_TRUE); aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, PR_TRUE);
ReflowInlineFrames(aState, aLine, aKeepReflowGoing, PR_TRUE); ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea, PR_TRUE);
aState.mY = oldY; aState.mY = oldY;
aState.mPrevBottomMargin = oldPrevBottomMargin; aState.mPrevBottomMargin = oldPrevBottomMargin;
aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, oldUnconstrainedWidth); aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, oldUnconstrainedWidth);
@ -3040,12 +3040,12 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, PR_FALSE); aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, PR_FALSE);
aState.SetFlag(BRS_COMPUTEMAXWIDTH, PR_FALSE); aState.SetFlag(BRS_COMPUTEMAXWIDTH, PR_FALSE);
rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing); rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea);
aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, oldComputeMaxElementSize); aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, oldComputeMaxElementSize);
aState.SetFlag(BRS_COMPUTEMAXWIDTH, oldComputeMaximumWidth); aState.SetFlag(BRS_COMPUTEMAXWIDTH, oldComputeMaximumWidth);
} else { } else {
rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing); rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea);
} }
// We don't really know what changed in the line, so use the union // We don't really know what changed in the line, so use the union
@ -3074,6 +3074,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
nsresult nsresult
nsBlockFrame::PullFrame(nsBlockReflowState& aState, nsBlockFrame::PullFrame(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool aDamageDeletedLines,
nsIFrame*& aFrameResult) nsIFrame*& aFrameResult)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -3082,7 +3083,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
// First check our remaining lines // First check our remaining lines
while (nsnull != aLine->mNext) { while (nsnull != aLine->mNext) {
rv = PullFrame(aState, aLine, &aLine->mNext, PR_FALSE, rv = PullFrame(aState, aLine, &aLine->mNext, PR_FALSE, aDamageDeletedLines,
aFrameResult, stopPulling); aFrameResult, stopPulling);
if (NS_FAILED(rv) || stopPulling) { if (NS_FAILED(rv) || stopPulling) {
return rv; return rv;
@ -3098,7 +3099,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
aState.mNextInFlow = nextInFlow; aState.mNextInFlow = nextInFlow;
continue; continue;
} }
rv = PullFrame(aState, aLine, &nextInFlow->mLines, PR_TRUE, rv = PullFrame(aState, aLine, &nextInFlow->mLines, PR_TRUE, aDamageDeletedLines,
aFrameResult, stopPulling); aFrameResult, stopPulling);
if (NS_FAILED(rv) || stopPulling) { if (NS_FAILED(rv) || stopPulling) {
return rv; return rv;
@ -3126,6 +3127,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
nsLineBox** aFromList, nsLineBox** aFromList,
PRBool aUpdateGeometricParent, PRBool aUpdateGeometricParent,
PRBool aDamageDeletedLines,
nsIFrame*& aFrameResult, nsIFrame*& aFrameResult,
PRBool& aStopPulling) PRBool& aStopPulling)
{ {
@ -3155,6 +3157,10 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
} }
else { else {
// Free up the fromLine now that it's empty // Free up the fromLine now that it's empty
// Its bounds might need to be redrawn, though.
if (aDamageDeletedLines) {
Invalidate(aState.mPresContext, fromLine->mBounds);
}
*aFromList = fromLine->mNext; *aFromList = fromLine->mNext;
aState.FreeLineBox(fromLine); aState.FreeLineBox(fromLine);
} }
@ -3860,6 +3866,7 @@ nsresult
nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState, nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRBool aDamageDirtyArea,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -3876,12 +3883,12 @@ nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState,
if (aState.mReflowState.mReflowDepth > 30) {//XXX layout-tune.h? if (aState.mReflowState.mReflowDepth > 30) {//XXX layout-tune.h?
rv = DoReflowInlineFramesMalloc(aState, aLine, aKeepReflowGoing, rv = DoReflowInlineFramesMalloc(aState, aLine, aKeepReflowGoing,
&lineReflowStatus, &lineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
} }
else { else {
rv = DoReflowInlineFramesAuto(aState, aLine, aKeepReflowGoing, rv = DoReflowInlineFramesAuto(aState, aLine, aKeepReflowGoing,
&lineReflowStatus, &lineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
} }
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
break; break;
@ -3903,7 +3910,8 @@ nsBlockFrame::DoReflowInlineFramesMalloc(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
nsLineLayout* ll = new nsLineLayout(aState.mPresContext, nsLineLayout* ll = new nsLineLayout(aState.mPresContext,
aState.mReflowState.mSpaceManager, aState.mReflowState.mSpaceManager,
@ -3915,7 +3923,7 @@ nsBlockFrame::DoReflowInlineFramesMalloc(nsBlockReflowState& aState,
ll->Init(&aState, aState.mMinLineHeight, aState.mLineNumber); ll->Init(&aState, aState.mMinLineHeight, aState.mLineNumber);
ll->SetReflowTextRuns(mTextRuns); ll->SetReflowTextRuns(mTextRuns);
nsresult rv = DoReflowInlineFrames(aState, *ll, aLine, aKeepReflowGoing, nsresult rv = DoReflowInlineFrames(aState, *ll, aLine, aKeepReflowGoing,
aLineReflowStatus, aUpdateMaximumWidth); aLineReflowStatus, aUpdateMaximumWidth, aDamageDirtyArea);
ll->EndLineReflow(); ll->EndLineReflow();
delete ll; delete ll;
return rv; return rv;
@ -3926,7 +3934,8 @@ nsBlockFrame::DoReflowInlineFramesAuto(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
nsLineLayout lineLayout(aState.mPresContext, nsLineLayout lineLayout(aState.mPresContext,
aState.mReflowState.mSpaceManager, aState.mReflowState.mSpaceManager,
@ -3936,7 +3945,7 @@ nsBlockFrame::DoReflowInlineFramesAuto(nsBlockReflowState& aState,
lineLayout.SetReflowTextRuns(mTextRuns); lineLayout.SetReflowTextRuns(mTextRuns);
nsresult rv = DoReflowInlineFrames(aState, lineLayout, aLine, nsresult rv = DoReflowInlineFrames(aState, lineLayout, aLine,
aKeepReflowGoing, aLineReflowStatus, aKeepReflowGoing, aLineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
lineLayout.EndLineReflow(); lineLayout.EndLineReflow();
return rv; return rv;
} }
@ -3947,7 +3956,8 @@ nsBlockFrame::DoReflowInlineFrames(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
// Forget all of the floaters on the line // Forget all of the floaters on the line
aLine->FreeFloaters(aState.mFloaterCacheFreeList); aLine->FreeFloaters(aState.mFloaterCacheFreeList);
@ -4023,7 +4033,7 @@ nsBlockFrame::DoReflowInlineFrames(nsBlockReflowState& aState,
// Pull frames and reflow them until we can't // Pull frames and reflow them until we can't
while (LINE_REFLOW_OK == lineReflowStatus) { while (LINE_REFLOW_OK == lineReflowStatus) {
rv = PullFrame(aState, aLine, frame); rv = PullFrame(aState, aLine, aDamageDirtyArea, frame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
} }

36
layout/html/base/src/nsBlockFrame.cpp
Просмотреть файл

@ -3017,7 +3017,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
// associated floater we don't end up resetting the line's right edge and // associated floater we don't end up resetting the line's right edge and
// have it think the width is unconstrained... // have it think the width is unconstrained...
aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, PR_TRUE); aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, PR_TRUE);
ReflowInlineFrames(aState, aLine, aKeepReflowGoing, PR_TRUE); ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea, PR_TRUE);
aState.mY = oldY; aState.mY = oldY;
aState.mPrevBottomMargin = oldPrevBottomMargin; aState.mPrevBottomMargin = oldPrevBottomMargin;
aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, oldUnconstrainedWidth); aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, oldUnconstrainedWidth);
@ -3040,12 +3040,12 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, PR_FALSE); aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, PR_FALSE);
aState.SetFlag(BRS_COMPUTEMAXWIDTH, PR_FALSE); aState.SetFlag(BRS_COMPUTEMAXWIDTH, PR_FALSE);
rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing); rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea);
aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, oldComputeMaxElementSize); aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, oldComputeMaxElementSize);
aState.SetFlag(BRS_COMPUTEMAXWIDTH, oldComputeMaximumWidth); aState.SetFlag(BRS_COMPUTEMAXWIDTH, oldComputeMaximumWidth);
} else { } else {
rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing); rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea);
} }
// We don't really know what changed in the line, so use the union // We don't really know what changed in the line, so use the union
@ -3074,6 +3074,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
nsresult nsresult
nsBlockFrame::PullFrame(nsBlockReflowState& aState, nsBlockFrame::PullFrame(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool aDamageDeletedLines,
nsIFrame*& aFrameResult) nsIFrame*& aFrameResult)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -3082,7 +3083,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
// First check our remaining lines // First check our remaining lines
while (nsnull != aLine->mNext) { while (nsnull != aLine->mNext) {
rv = PullFrame(aState, aLine, &aLine->mNext, PR_FALSE, rv = PullFrame(aState, aLine, &aLine->mNext, PR_FALSE, aDamageDeletedLines,
aFrameResult, stopPulling); aFrameResult, stopPulling);
if (NS_FAILED(rv) || stopPulling) { if (NS_FAILED(rv) || stopPulling) {
return rv; return rv;
@ -3098,7 +3099,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
aState.mNextInFlow = nextInFlow; aState.mNextInFlow = nextInFlow;
continue; continue;
} }
rv = PullFrame(aState, aLine, &nextInFlow->mLines, PR_TRUE, rv = PullFrame(aState, aLine, &nextInFlow->mLines, PR_TRUE, aDamageDeletedLines,
aFrameResult, stopPulling); aFrameResult, stopPulling);
if (NS_FAILED(rv) || stopPulling) { if (NS_FAILED(rv) || stopPulling) {
return rv; return rv;
@ -3126,6 +3127,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
nsLineBox** aFromList, nsLineBox** aFromList,
PRBool aUpdateGeometricParent, PRBool aUpdateGeometricParent,
PRBool aDamageDeletedLines,
nsIFrame*& aFrameResult, nsIFrame*& aFrameResult,
PRBool& aStopPulling) PRBool& aStopPulling)
{ {
@ -3155,6 +3157,10 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
} }
else { else {
// Free up the fromLine now that it's empty // Free up the fromLine now that it's empty
// Its bounds might need to be redrawn, though.
if (aDamageDeletedLines) {
Invalidate(aState.mPresContext, fromLine->mBounds);
}
*aFromList = fromLine->mNext; *aFromList = fromLine->mNext;
aState.FreeLineBox(fromLine); aState.FreeLineBox(fromLine);
} }
@ -3860,6 +3866,7 @@ nsresult
nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState, nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRBool aDamageDirtyArea,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -3876,12 +3883,12 @@ nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState,
if (aState.mReflowState.mReflowDepth > 30) {//XXX layout-tune.h? if (aState.mReflowState.mReflowDepth > 30) {//XXX layout-tune.h?
rv = DoReflowInlineFramesMalloc(aState, aLine, aKeepReflowGoing, rv = DoReflowInlineFramesMalloc(aState, aLine, aKeepReflowGoing,
&lineReflowStatus, &lineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
} }
else { else {
rv = DoReflowInlineFramesAuto(aState, aLine, aKeepReflowGoing, rv = DoReflowInlineFramesAuto(aState, aLine, aKeepReflowGoing,
&lineReflowStatus, &lineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
} }
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
break; break;
@ -3903,7 +3910,8 @@ nsBlockFrame::DoReflowInlineFramesMalloc(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
nsLineLayout* ll = new nsLineLayout(aState.mPresContext, nsLineLayout* ll = new nsLineLayout(aState.mPresContext,
aState.mReflowState.mSpaceManager, aState.mReflowState.mSpaceManager,
@ -3915,7 +3923,7 @@ nsBlockFrame::DoReflowInlineFramesMalloc(nsBlockReflowState& aState,
ll->Init(&aState, aState.mMinLineHeight, aState.mLineNumber); ll->Init(&aState, aState.mMinLineHeight, aState.mLineNumber);
ll->SetReflowTextRuns(mTextRuns); ll->SetReflowTextRuns(mTextRuns);
nsresult rv = DoReflowInlineFrames(aState, *ll, aLine, aKeepReflowGoing, nsresult rv = DoReflowInlineFrames(aState, *ll, aLine, aKeepReflowGoing,
aLineReflowStatus, aUpdateMaximumWidth); aLineReflowStatus, aUpdateMaximumWidth, aDamageDirtyArea);
ll->EndLineReflow(); ll->EndLineReflow();
delete ll; delete ll;
return rv; return rv;
@ -3926,7 +3934,8 @@ nsBlockFrame::DoReflowInlineFramesAuto(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
nsLineLayout lineLayout(aState.mPresContext, nsLineLayout lineLayout(aState.mPresContext,
aState.mReflowState.mSpaceManager, aState.mReflowState.mSpaceManager,
@ -3936,7 +3945,7 @@ nsBlockFrame::DoReflowInlineFramesAuto(nsBlockReflowState& aState,
lineLayout.SetReflowTextRuns(mTextRuns); lineLayout.SetReflowTextRuns(mTextRuns);
nsresult rv = DoReflowInlineFrames(aState, lineLayout, aLine, nsresult rv = DoReflowInlineFrames(aState, lineLayout, aLine,
aKeepReflowGoing, aLineReflowStatus, aKeepReflowGoing, aLineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
lineLayout.EndLineReflow(); lineLayout.EndLineReflow();
return rv; return rv;
} }
@ -3947,7 +3956,8 @@ nsBlockFrame::DoReflowInlineFrames(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
// Forget all of the floaters on the line // Forget all of the floaters on the line
aLine->FreeFloaters(aState.mFloaterCacheFreeList); aLine->FreeFloaters(aState.mFloaterCacheFreeList);
@ -4023,7 +4033,7 @@ nsBlockFrame::DoReflowInlineFrames(nsBlockReflowState& aState,
// Pull frames and reflow them until we can't // Pull frames and reflow them until we can't
while (LINE_REFLOW_OK == lineReflowStatus) { while (LINE_REFLOW_OK == lineReflowStatus) {
rv = PullFrame(aState, aLine, frame); rv = PullFrame(aState, aLine, aDamageDirtyArea, frame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
} }

12
layout/html/base/src/nsBlockFrame.h
Просмотреть файл

@ -290,6 +290,7 @@ protected:
nsresult ReflowInlineFrames(nsBlockReflowState& aState, nsresult ReflowInlineFrames(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepLineGoing, PRBool* aKeepLineGoing,
PRBool aDamageDirtyArea,
PRBool aUpdateMaximumWidth = PR_FALSE); PRBool aUpdateMaximumWidth = PR_FALSE);
nsresult DoReflowInlineFrames(nsBlockReflowState& aState, nsresult DoReflowInlineFrames(nsBlockReflowState& aState,
@ -297,19 +298,22 @@ protected:
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth); PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea);
nsresult DoReflowInlineFramesAuto(nsBlockReflowState& aState, nsresult DoReflowInlineFramesAuto(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth); PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea);
nsresult DoReflowInlineFramesMalloc(nsBlockReflowState& aState, nsresult DoReflowInlineFramesMalloc(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth); PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea);
nsresult ReflowInlineFrame(nsBlockReflowState& aState, nsresult ReflowInlineFrame(nsBlockReflowState& aState,
nsLineLayout& aLineLayout, nsLineLayout& aLineLayout,
@ -340,12 +344,14 @@ protected:
nsresult PullFrame(nsBlockReflowState& aState, nsresult PullFrame(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool aDamageDeletedLine,
nsIFrame*& aFrameResult); nsIFrame*& aFrameResult);
nsresult PullFrame(nsBlockReflowState& aState, nsresult PullFrame(nsBlockReflowState& aState,
nsLineBox* aToLine, nsLineBox* aToLine,
nsLineBox** aFromList, nsLineBox** aFromList,
PRBool aUpdateGeometricParent, PRBool aUpdateGeometricParent,
PRBool aDamageDeletedLines,
nsIFrame*& aFrameResult, nsIFrame*& aFrameResult,
PRBool& aStopPulling); PRBool& aStopPulling);

36
layout/html/base/src/nsBlockReflowState.cpp
Просмотреть файл

@ -3017,7 +3017,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
// associated floater we don't end up resetting the line's right edge and // associated floater we don't end up resetting the line's right edge and
// have it think the width is unconstrained... // have it think the width is unconstrained...
aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, PR_TRUE); aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, PR_TRUE);
ReflowInlineFrames(aState, aLine, aKeepReflowGoing, PR_TRUE); ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea, PR_TRUE);
aState.mY = oldY; aState.mY = oldY;
aState.mPrevBottomMargin = oldPrevBottomMargin; aState.mPrevBottomMargin = oldPrevBottomMargin;
aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, oldUnconstrainedWidth); aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, oldUnconstrainedWidth);
@ -3040,12 +3040,12 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, PR_FALSE); aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, PR_FALSE);
aState.SetFlag(BRS_COMPUTEMAXWIDTH, PR_FALSE); aState.SetFlag(BRS_COMPUTEMAXWIDTH, PR_FALSE);
rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing); rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea);
aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, oldComputeMaxElementSize); aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, oldComputeMaxElementSize);
aState.SetFlag(BRS_COMPUTEMAXWIDTH, oldComputeMaximumWidth); aState.SetFlag(BRS_COMPUTEMAXWIDTH, oldComputeMaximumWidth);
} else { } else {
rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing); rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea);
} }
// We don't really know what changed in the line, so use the union // We don't really know what changed in the line, so use the union
@ -3074,6 +3074,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
nsresult nsresult
nsBlockFrame::PullFrame(nsBlockReflowState& aState, nsBlockFrame::PullFrame(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool aDamageDeletedLines,
nsIFrame*& aFrameResult) nsIFrame*& aFrameResult)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -3082,7 +3083,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
// First check our remaining lines // First check our remaining lines
while (nsnull != aLine->mNext) { while (nsnull != aLine->mNext) {
rv = PullFrame(aState, aLine, &aLine->mNext, PR_FALSE, rv = PullFrame(aState, aLine, &aLine->mNext, PR_FALSE, aDamageDeletedLines,
aFrameResult, stopPulling); aFrameResult, stopPulling);
if (NS_FAILED(rv) || stopPulling) { if (NS_FAILED(rv) || stopPulling) {
return rv; return rv;
@ -3098,7 +3099,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
aState.mNextInFlow = nextInFlow; aState.mNextInFlow = nextInFlow;
continue; continue;
} }
rv = PullFrame(aState, aLine, &nextInFlow->mLines, PR_TRUE, rv = PullFrame(aState, aLine, &nextInFlow->mLines, PR_TRUE, aDamageDeletedLines,
aFrameResult, stopPulling); aFrameResult, stopPulling);
if (NS_FAILED(rv) || stopPulling) { if (NS_FAILED(rv) || stopPulling) {
return rv; return rv;
@ -3126,6 +3127,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
nsLineBox** aFromList, nsLineBox** aFromList,
PRBool aUpdateGeometricParent, PRBool aUpdateGeometricParent,
PRBool aDamageDeletedLines,
nsIFrame*& aFrameResult, nsIFrame*& aFrameResult,
PRBool& aStopPulling) PRBool& aStopPulling)
{ {
@ -3155,6 +3157,10 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
} }
else { else {
// Free up the fromLine now that it's empty // Free up the fromLine now that it's empty
// Its bounds might need to be redrawn, though.
if (aDamageDeletedLines) {
Invalidate(aState.mPresContext, fromLine->mBounds);
}
*aFromList = fromLine->mNext; *aFromList = fromLine->mNext;
aState.FreeLineBox(fromLine); aState.FreeLineBox(fromLine);
} }
@ -3860,6 +3866,7 @@ nsresult
nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState, nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRBool aDamageDirtyArea,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -3876,12 +3883,12 @@ nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState,
if (aState.mReflowState.mReflowDepth > 30) {//XXX layout-tune.h? if (aState.mReflowState.mReflowDepth > 30) {//XXX layout-tune.h?
rv = DoReflowInlineFramesMalloc(aState, aLine, aKeepReflowGoing, rv = DoReflowInlineFramesMalloc(aState, aLine, aKeepReflowGoing,
&lineReflowStatus, &lineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
} }
else { else {
rv = DoReflowInlineFramesAuto(aState, aLine, aKeepReflowGoing, rv = DoReflowInlineFramesAuto(aState, aLine, aKeepReflowGoing,
&lineReflowStatus, &lineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
} }
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
break; break;
@ -3903,7 +3910,8 @@ nsBlockFrame::DoReflowInlineFramesMalloc(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
nsLineLayout* ll = new nsLineLayout(aState.mPresContext, nsLineLayout* ll = new nsLineLayout(aState.mPresContext,
aState.mReflowState.mSpaceManager, aState.mReflowState.mSpaceManager,
@ -3915,7 +3923,7 @@ nsBlockFrame::DoReflowInlineFramesMalloc(nsBlockReflowState& aState,
ll->Init(&aState, aState.mMinLineHeight, aState.mLineNumber); ll->Init(&aState, aState.mMinLineHeight, aState.mLineNumber);
ll->SetReflowTextRuns(mTextRuns); ll->SetReflowTextRuns(mTextRuns);
nsresult rv = DoReflowInlineFrames(aState, *ll, aLine, aKeepReflowGoing, nsresult rv = DoReflowInlineFrames(aState, *ll, aLine, aKeepReflowGoing,
aLineReflowStatus, aUpdateMaximumWidth); aLineReflowStatus, aUpdateMaximumWidth, aDamageDirtyArea);
ll->EndLineReflow(); ll->EndLineReflow();
delete ll; delete ll;
return rv; return rv;
@ -3926,7 +3934,8 @@ nsBlockFrame::DoReflowInlineFramesAuto(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
nsLineLayout lineLayout(aState.mPresContext, nsLineLayout lineLayout(aState.mPresContext,
aState.mReflowState.mSpaceManager, aState.mReflowState.mSpaceManager,
@ -3936,7 +3945,7 @@ nsBlockFrame::DoReflowInlineFramesAuto(nsBlockReflowState& aState,
lineLayout.SetReflowTextRuns(mTextRuns); lineLayout.SetReflowTextRuns(mTextRuns);
nsresult rv = DoReflowInlineFrames(aState, lineLayout, aLine, nsresult rv = DoReflowInlineFrames(aState, lineLayout, aLine,
aKeepReflowGoing, aLineReflowStatus, aKeepReflowGoing, aLineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
lineLayout.EndLineReflow(); lineLayout.EndLineReflow();
return rv; return rv;
} }
@ -3947,7 +3956,8 @@ nsBlockFrame::DoReflowInlineFrames(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
// Forget all of the floaters on the line // Forget all of the floaters on the line
aLine->FreeFloaters(aState.mFloaterCacheFreeList); aLine->FreeFloaters(aState.mFloaterCacheFreeList);
@ -4023,7 +4033,7 @@ nsBlockFrame::DoReflowInlineFrames(nsBlockReflowState& aState,
// Pull frames and reflow them until we can't // Pull frames and reflow them until we can't
while (LINE_REFLOW_OK == lineReflowStatus) { while (LINE_REFLOW_OK == lineReflowStatus) {
rv = PullFrame(aState, aLine, frame); rv = PullFrame(aState, aLine, aDamageDirtyArea, frame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
} }

36
layout/html/base/src/nsBlockReflowState.h
Просмотреть файл

@ -3017,7 +3017,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
// associated floater we don't end up resetting the line's right edge and // associated floater we don't end up resetting the line's right edge and
// have it think the width is unconstrained... // have it think the width is unconstrained...
aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, PR_TRUE); aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, PR_TRUE);
ReflowInlineFrames(aState, aLine, aKeepReflowGoing, PR_TRUE); ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea, PR_TRUE);
aState.mY = oldY; aState.mY = oldY;
aState.mPrevBottomMargin = oldPrevBottomMargin; aState.mPrevBottomMargin = oldPrevBottomMargin;
aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, oldUnconstrainedWidth); aState.SetFlag(BRS_UNCONSTRAINEDWIDTH, oldUnconstrainedWidth);
@ -3040,12 +3040,12 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, PR_FALSE); aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, PR_FALSE);
aState.SetFlag(BRS_COMPUTEMAXWIDTH, PR_FALSE); aState.SetFlag(BRS_COMPUTEMAXWIDTH, PR_FALSE);
rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing); rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea);
aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, oldComputeMaxElementSize); aState.SetFlag(BRS_COMPUTEMAXELEMENTSIZE, oldComputeMaxElementSize);
aState.SetFlag(BRS_COMPUTEMAXWIDTH, oldComputeMaximumWidth); aState.SetFlag(BRS_COMPUTEMAXWIDTH, oldComputeMaximumWidth);
} else { } else {
rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing); rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea);
} }
// We don't really know what changed in the line, so use the union // We don't really know what changed in the line, so use the union
@ -3074,6 +3074,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
nsresult nsresult
nsBlockFrame::PullFrame(nsBlockReflowState& aState, nsBlockFrame::PullFrame(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool aDamageDeletedLines,
nsIFrame*& aFrameResult) nsIFrame*& aFrameResult)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -3082,7 +3083,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
// First check our remaining lines // First check our remaining lines
while (nsnull != aLine->mNext) { while (nsnull != aLine->mNext) {
rv = PullFrame(aState, aLine, &aLine->mNext, PR_FALSE, rv = PullFrame(aState, aLine, &aLine->mNext, PR_FALSE, aDamageDeletedLines,
aFrameResult, stopPulling); aFrameResult, stopPulling);
if (NS_FAILED(rv) || stopPulling) { if (NS_FAILED(rv) || stopPulling) {
return rv; return rv;
@ -3098,7 +3099,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
aState.mNextInFlow = nextInFlow; aState.mNextInFlow = nextInFlow;
continue; continue;
} }
rv = PullFrame(aState, aLine, &nextInFlow->mLines, PR_TRUE, rv = PullFrame(aState, aLine, &nextInFlow->mLines, PR_TRUE, aDamageDeletedLines,
aFrameResult, stopPulling); aFrameResult, stopPulling);
if (NS_FAILED(rv) || stopPulling) { if (NS_FAILED(rv) || stopPulling) {
return rv; return rv;
@ -3126,6 +3127,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
nsLineBox** aFromList, nsLineBox** aFromList,
PRBool aUpdateGeometricParent, PRBool aUpdateGeometricParent,
PRBool aDamageDeletedLines,
nsIFrame*& aFrameResult, nsIFrame*& aFrameResult,
PRBool& aStopPulling) PRBool& aStopPulling)
{ {
@ -3155,6 +3157,10 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
} }
else { else {
// Free up the fromLine now that it's empty // Free up the fromLine now that it's empty
// Its bounds might need to be redrawn, though.
if (aDamageDeletedLines) {
Invalidate(aState.mPresContext, fromLine->mBounds);
}
*aFromList = fromLine->mNext; *aFromList = fromLine->mNext;
aState.FreeLineBox(fromLine); aState.FreeLineBox(fromLine);
} }
@ -3860,6 +3866,7 @@ nsresult
nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState, nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRBool aDamageDirtyArea,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -3876,12 +3883,12 @@ nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState,
if (aState.mReflowState.mReflowDepth > 30) {//XXX layout-tune.h? if (aState.mReflowState.mReflowDepth > 30) {//XXX layout-tune.h?
rv = DoReflowInlineFramesMalloc(aState, aLine, aKeepReflowGoing, rv = DoReflowInlineFramesMalloc(aState, aLine, aKeepReflowGoing,
&lineReflowStatus, &lineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
} }
else { else {
rv = DoReflowInlineFramesAuto(aState, aLine, aKeepReflowGoing, rv = DoReflowInlineFramesAuto(aState, aLine, aKeepReflowGoing,
&lineReflowStatus, &lineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
} }
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
break; break;
@ -3903,7 +3910,8 @@ nsBlockFrame::DoReflowInlineFramesMalloc(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
nsLineLayout* ll = new nsLineLayout(aState.mPresContext, nsLineLayout* ll = new nsLineLayout(aState.mPresContext,
aState.mReflowState.mSpaceManager, aState.mReflowState.mSpaceManager,
@ -3915,7 +3923,7 @@ nsBlockFrame::DoReflowInlineFramesMalloc(nsBlockReflowState& aState,
ll->Init(&aState, aState.mMinLineHeight, aState.mLineNumber); ll->Init(&aState, aState.mMinLineHeight, aState.mLineNumber);
ll->SetReflowTextRuns(mTextRuns); ll->SetReflowTextRuns(mTextRuns);
nsresult rv = DoReflowInlineFrames(aState, *ll, aLine, aKeepReflowGoing, nsresult rv = DoReflowInlineFrames(aState, *ll, aLine, aKeepReflowGoing,
aLineReflowStatus, aUpdateMaximumWidth); aLineReflowStatus, aUpdateMaximumWidth, aDamageDirtyArea);
ll->EndLineReflow(); ll->EndLineReflow();
delete ll; delete ll;
return rv; return rv;
@ -3926,7 +3934,8 @@ nsBlockFrame::DoReflowInlineFramesAuto(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
nsLineLayout lineLayout(aState.mPresContext, nsLineLayout lineLayout(aState.mPresContext,
aState.mReflowState.mSpaceManager, aState.mReflowState.mSpaceManager,
@ -3936,7 +3945,7 @@ nsBlockFrame::DoReflowInlineFramesAuto(nsBlockReflowState& aState,
lineLayout.SetReflowTextRuns(mTextRuns); lineLayout.SetReflowTextRuns(mTextRuns);
nsresult rv = DoReflowInlineFrames(aState, lineLayout, aLine, nsresult rv = DoReflowInlineFrames(aState, lineLayout, aLine,
aKeepReflowGoing, aLineReflowStatus, aKeepReflowGoing, aLineReflowStatus,
aUpdateMaximumWidth); aUpdateMaximumWidth, aDamageDirtyArea);
lineLayout.EndLineReflow(); lineLayout.EndLineReflow();
return rv; return rv;
} }
@ -3947,7 +3956,8 @@ nsBlockFrame::DoReflowInlineFrames(nsBlockReflowState& aState,
nsLineBox* aLine, nsLineBox* aLine,
PRBool* aKeepReflowGoing, PRBool* aKeepReflowGoing,
PRUint8* aLineReflowStatus, PRUint8* aLineReflowStatus,
PRBool aUpdateMaximumWidth) PRBool aUpdateMaximumWidth,
PRBool aDamageDirtyArea)
{ {
// Forget all of the floaters on the line // Forget all of the floaters on the line
aLine->FreeFloaters(aState.mFloaterCacheFreeList); aLine->FreeFloaters(aState.mFloaterCacheFreeList);
@ -4023,7 +4033,7 @@ nsBlockFrame::DoReflowInlineFrames(nsBlockReflowState& aState,
// Pull frames and reflow them until we can't // Pull frames and reflow them until we can't
while (LINE_REFLOW_OK == lineReflowStatus) { while (LINE_REFLOW_OK == lineReflowStatus) {
rv = PullFrame(aState, aLine, frame); rv = PullFrame(aState, aLine, aDamageDirtyArea, frame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
} }