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

b=16456. Removed some debug assertion code that was incorrect and caused

Browse Source 
us to hit asserts when printing


git-svn-id: svn://10.0.0.236/trunk@55646 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com
1999-12-07 23:41:48 +00:00
parent a4c2e3c639
commit aa323aac76
6 changed files with 60 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4227,14 +4227,16 @@ nsBlockFrame::PushLines(nsBlockReflowState& aState)
nsLineBox* lastLine = aState.mPrevLine;
nsLineBox* nextLine = lastLine->mNext;
lastLine->mNext = nsnull;
SetOverflowLines(aState.mPresContext, nextLine);
// Mark all the overflow lines dirty so that they get reflowed when
// they are pulled up by our next-in-flow.
while (nsnull != nextLine) {
nextLine->MarkDirty();
nextLine = nextLine->mNext;
if (nextLine) {
lastLine->mNext = nsnull;
SetOverflowLines(aState.mPresContext, nextLine);
// Mark all the overflow lines dirty so that they get reflowed when
// they are pulled up by our next-in-flow.
while (nsnull != nextLine) {
nextLine->MarkDirty();
nextLine = nextLine->mNext;
}
}
// Break frame sibling list
@@ -6291,15 +6293,12 @@ nsBlockFrame::VerifyLines(PRBool aFinalCheckOK)
void
nsBlockFrame::VerifyOverflowSituation(nsIPresContext* aPresContext)
{
PRBool haveOverflow = PR_FALSE;
nsBlockFrame* flow = (nsBlockFrame*) GetFirstInFlow();
while (nsnull != flow) {
nsLineBox* overflowLines = GetOverflowLines(aPresContext, PR_FALSE);
if (nsnull != overflowLines) {
NS_ASSERTION(nsnull != overflowLines->mFirstChild,
"bad overflow list");
NS_ASSERTION(!haveOverflow, "two frames with overflow lists");
haveOverflow = PR_TRUE;
}
flow = (nsBlockFrame*) flow->mNextInFlow;
}

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

@@ -4227,14 +4227,16 @@ nsBlockFrame::PushLines(nsBlockReflowState& aState)
nsLineBox* lastLine = aState.mPrevLine;
nsLineBox* nextLine = lastLine->mNext;
lastLine->mNext = nsnull;
SetOverflowLines(aState.mPresContext, nextLine);
// Mark all the overflow lines dirty so that they get reflowed when
// they are pulled up by our next-in-flow.
while (nsnull != nextLine) {
nextLine->MarkDirty();
nextLine = nextLine->mNext;
if (nextLine) {
lastLine->mNext = nsnull;
SetOverflowLines(aState.mPresContext, nextLine);
// Mark all the overflow lines dirty so that they get reflowed when
// they are pulled up by our next-in-flow.
while (nsnull != nextLine) {
nextLine->MarkDirty();
nextLine = nextLine->mNext;
}
}
// Break frame sibling list
@@ -6291,15 +6293,12 @@ nsBlockFrame::VerifyLines(PRBool aFinalCheckOK)
void
nsBlockFrame::VerifyOverflowSituation(nsIPresContext* aPresContext)
{
PRBool haveOverflow = PR_FALSE;
nsBlockFrame* flow = (nsBlockFrame*) GetFirstInFlow();
while (nsnull != flow) {
nsLineBox* overflowLines = GetOverflowLines(aPresContext, PR_FALSE);
if (nsnull != overflowLines) {
NS_ASSERTION(nsnull != overflowLines->mFirstChild,
"bad overflow list");
NS_ASSERTION(!haveOverflow, "two frames with overflow lists");
haveOverflow = PR_TRUE;
}
flow = (nsBlockFrame*) flow->mNextInFlow;
}

21
mozilla/layout/generic/nsBlockReflowState.h
View File

@@ -4227,14 +4227,16 @@ nsBlockFrame::PushLines(nsBlockReflowState& aState)
nsLineBox* lastLine = aState.mPrevLine;
nsLineBox* nextLine = lastLine->mNext;
lastLine->mNext = nsnull;
SetOverflowLines(aState.mPresContext, nextLine);
// Mark all the overflow lines dirty so that they get reflowed when
// they are pulled up by our next-in-flow.
while (nsnull != nextLine) {
nextLine->MarkDirty();
nextLine = nextLine->mNext;
if (nextLine) {
lastLine->mNext = nsnull;
SetOverflowLines(aState.mPresContext, nextLine);
// Mark all the overflow lines dirty so that they get reflowed when
// they are pulled up by our next-in-flow.
while (nsnull != nextLine) {
nextLine->MarkDirty();
nextLine = nextLine->mNext;
}
}
// Break frame sibling list
@@ -6291,15 +6293,12 @@ nsBlockFrame::VerifyLines(PRBool aFinalCheckOK)
void
nsBlockFrame::VerifyOverflowSituation(nsIPresContext* aPresContext)
{
PRBool haveOverflow = PR_FALSE;
nsBlockFrame* flow = (nsBlockFrame*) GetFirstInFlow();
while (nsnull != flow) {
nsLineBox* overflowLines = GetOverflowLines(aPresContext, PR_FALSE);
if (nsnull != overflowLines) {
NS_ASSERTION(nsnull != overflowLines->mFirstChild,
"bad overflow list");
NS_ASSERTION(!haveOverflow, "two frames with overflow lists");
haveOverflow = PR_TRUE;
}
flow = (nsBlockFrame*) flow->mNextInFlow;
}

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

@@ -4227,14 +4227,16 @@ nsBlockFrame::PushLines(nsBlockReflowState& aState)
nsLineBox* lastLine = aState.mPrevLine;
nsLineBox* nextLine = lastLine->mNext;
lastLine->mNext = nsnull;
SetOverflowLines(aState.mPresContext, nextLine);
// Mark all the overflow lines dirty so that they get reflowed when
// they are pulled up by our next-in-flow.
while (nsnull != nextLine) {
nextLine->MarkDirty();
nextLine = nextLine->mNext;
if (nextLine) {
lastLine->mNext = nsnull;
SetOverflowLines(aState.mPresContext, nextLine);
// Mark all the overflow lines dirty so that they get reflowed when
// they are pulled up by our next-in-flow.
while (nsnull != nextLine) {
nextLine->MarkDirty();
nextLine = nextLine->mNext;
}
}
// Break frame sibling list
@@ -6291,15 +6293,12 @@ nsBlockFrame::VerifyLines(PRBool aFinalCheckOK)
void
nsBlockFrame::VerifyOverflowSituation(nsIPresContext* aPresContext)
{
PRBool haveOverflow = PR_FALSE;
nsBlockFrame* flow = (nsBlockFrame*) GetFirstInFlow();
while (nsnull != flow) {
nsLineBox* overflowLines = GetOverflowLines(aPresContext, PR_FALSE);
if (nsnull != overflowLines) {
NS_ASSERTION(nsnull != overflowLines->mFirstChild,
"bad overflow list");
NS_ASSERTION(!haveOverflow, "two frames with overflow lists");
haveOverflow = PR_TRUE;
}
flow = (nsBlockFrame*) flow->mNextInFlow;
}

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

@@ -4227,14 +4227,16 @@ nsBlockFrame::PushLines(nsBlockReflowState& aState)
nsLineBox* lastLine = aState.mPrevLine;
nsLineBox* nextLine = lastLine->mNext;
lastLine->mNext = nsnull;
SetOverflowLines(aState.mPresContext, nextLine);
// Mark all the overflow lines dirty so that they get reflowed when
// they are pulled up by our next-in-flow.
while (nsnull != nextLine) {
nextLine->MarkDirty();
nextLine = nextLine->mNext;
if (nextLine) {
lastLine->mNext = nsnull;
SetOverflowLines(aState.mPresContext, nextLine);
// Mark all the overflow lines dirty so that they get reflowed when
// they are pulled up by our next-in-flow.
while (nsnull != nextLine) {
nextLine->MarkDirty();
nextLine = nextLine->mNext;
}
}
// Break frame sibling list
@@ -6291,15 +6293,12 @@ nsBlockFrame::VerifyLines(PRBool aFinalCheckOK)
void
nsBlockFrame::VerifyOverflowSituation(nsIPresContext* aPresContext)
{
PRBool haveOverflow = PR_FALSE;
nsBlockFrame* flow = (nsBlockFrame*) GetFirstInFlow();
while (nsnull != flow) {
nsLineBox* overflowLines = GetOverflowLines(aPresContext, PR_FALSE);
if (nsnull != overflowLines) {
NS_ASSERTION(nsnull != overflowLines->mFirstChild,
"bad overflow list");
NS_ASSERTION(!haveOverflow, "two frames with overflow lists");
haveOverflow = PR_TRUE;
}
flow = (nsBlockFrame*) flow->mNextInFlow;
}

21
mozilla/layout/html/base/src/nsBlockReflowState.h
View File

@@ -4227,14 +4227,16 @@ nsBlockFrame::PushLines(nsBlockReflowState& aState)
nsLineBox* lastLine = aState.mPrevLine;
nsLineBox* nextLine = lastLine->mNext;
lastLine->mNext = nsnull;
SetOverflowLines(aState.mPresContext, nextLine);
// Mark all the overflow lines dirty so that they get reflowed when
// they are pulled up by our next-in-flow.
while (nsnull != nextLine) {
nextLine->MarkDirty();
nextLine = nextLine->mNext;
if (nextLine) {
lastLine->mNext = nsnull;
SetOverflowLines(aState.mPresContext, nextLine);
// Mark all the overflow lines dirty so that they get reflowed when
// they are pulled up by our next-in-flow.
while (nsnull != nextLine) {
nextLine->MarkDirty();
nextLine = nextLine->mNext;
}
}
// Break frame sibling list
@@ -6291,15 +6293,12 @@ nsBlockFrame::VerifyLines(PRBool aFinalCheckOK)
void
nsBlockFrame::VerifyOverflowSituation(nsIPresContext* aPresContext)
{
PRBool haveOverflow = PR_FALSE;
nsBlockFrame* flow = (nsBlockFrame*) GetFirstInFlow();
while (nsnull != flow) {
nsLineBox* overflowLines = GetOverflowLines(aPresContext, PR_FALSE);
if (nsnull != overflowLines) {
NS_ASSERTION(nsnull != overflowLines->mFirstChild,
"bad overflow list");
NS_ASSERTION(!haveOverflow, "two frames with overflow lists");
haveOverflow = PR_TRUE;
}
flow = (nsBlockFrame*) flow->mNextInFlow;
}