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

Fixed verify reflow to avoid creating reflow commands during a verify reflow

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@15368 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com 1998-11-26 18:11:02 +00:00
parent 03e51bc9c4
commit ebb0b9f0d8
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/layout/base/nsPresShell.cpp
View File

@ -247,6 +247,7 @@ protected:
#ifdef NS_DEBUG
void VerifyIncrementalReflow();
PRBool mInVerifyReflow;
#endif
nsIDocument* mDocument;
@ -717,6 +718,11 @@ PresShell::EndReflow(nsIDocument *aDocument, nsIPresShell* aShell)
void
PresShell::AppendReflowCommand(nsIReflowCommand* aReflowCommand)
{
#ifdef NS_DEBUG
if (mInVerifyReflow) {
return;
}
#endif
mReflowCommands.AppendElement(aReflowCommand);
NS_ADDREF(aReflowCommand);
}
@ -749,18 +755,25 @@ PresShell::ProcessReflowCommands()
NS_FRAME_LOG(NS_FRAME_TRACE_CALLS,
("PresShell::ProcessReflowCommands: end reflow command"));
}
NS_IF_RELEASE(rcx);
// Place and size the root frame
mRootFrame->SizeTo(desiredSize.width, desiredSize.height);
#ifdef NS_DEBUG
if (nsIFrame::GetVerifyTreeEnable()) {
mRootFrame->VerifyTree();
}
if (GetVerifyReflowEnable()) {
mInVerifyReflow = PR_TRUE;
VerifyIncrementalReflow();
mInVerifyReflow = PR_FALSE;
if (0 != mReflowCommands.Count()) {
printf("XXX yikes!\n");
}
}
#endif
NS_IF_RELEASE(rcx);
}
}

15
mozilla/layout/html/base/src/nsPresShell.cpp
View File

@ -247,6 +247,7 @@ protected:
#ifdef NS_DEBUG
void VerifyIncrementalReflow();
PRBool mInVerifyReflow;
#endif
nsIDocument* mDocument;
@ -717,6 +718,11 @@ PresShell::EndReflow(nsIDocument *aDocument, nsIPresShell* aShell)
void
PresShell::AppendReflowCommand(nsIReflowCommand* aReflowCommand)
{
#ifdef NS_DEBUG
if (mInVerifyReflow) {
return;
}
#endif
mReflowCommands.AppendElement(aReflowCommand);
NS_ADDREF(aReflowCommand);
}
@ -749,18 +755,25 @@ PresShell::ProcessReflowCommands()
NS_FRAME_LOG(NS_FRAME_TRACE_CALLS,
("PresShell::ProcessReflowCommands: end reflow command"));
}
NS_IF_RELEASE(rcx);
// Place and size the root frame
mRootFrame->SizeTo(desiredSize.width, desiredSize.height);
#ifdef NS_DEBUG
if (nsIFrame::GetVerifyTreeEnable()) {
mRootFrame->VerifyTree();
}
if (GetVerifyReflowEnable()) {
mInVerifyReflow = PR_TRUE;
VerifyIncrementalReflow();
mInVerifyReflow = PR_FALSE;
if (0 != mReflowCommands.Count()) {
printf("XXX yikes!\n");
}
}
#endif
NS_IF_RELEASE(rcx);
}
}