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

Removed an assert that was being triggered in a caseI didn't expect

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@16455 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com 1998-12-15 21:26:05 +00:00
parent c3693fede6
commit a6cb99357c
2 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp
View File

@ -872,30 +872,31 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext& aPresContext,
rv = ReflowChild(kidFrame, aPresContext, desiredSize, kidReflowState, aStatus);
kidFrame->SizeTo(desiredSize.width, desiredSize.height);
NS_ASSERTION(NS_FRAME_IS_NOT_COMPLETE(aStatus), "unexpected status");
((nsTableRowFrame *)kidFrame)->DidResize(aPresContext, aReflowState);
// Create a continuing frame, add it to the child list, and then push it
// and the frames that follow
// XXX Check whether it already has a next-in-flow
nsIFrame* continuingFrame;
nsIStyleContext* kidSC;
kidFrame->GetStyleContext(kidSC);
kidFrame->CreateContinuingFrame(aPresContext, this, kidSC, continuingFrame);
NS_RELEASE(kidSC);
// Add it to the child list
nsIFrame* nextSibling;
kidFrame->GetNextSibling(nextSibling);
continuingFrame->SetNextSibling(nextSibling);
kidFrame->SetNextSibling(continuingFrame);
// Push it and the frames that follow
PushChildren(continuingFrame, kidFrame);
aDesiredSize.height = desiredSize.height;
if (NS_FRAME_IS_NOT_COMPLETE(aStatus)) {
// Create a continuing frame, add it to the child list, and then push it
// and the frames that follow
// XXX Check whether it already has a next-in-flow
nsIFrame* continuingFrame;
nsIStyleContext* kidSC;
kidFrame->GetStyleContext(kidSC);
kidFrame->CreateContinuingFrame(aPresContext, this, kidSC, continuingFrame);
NS_RELEASE(kidSC);
// Add it to the child list
nsIFrame* nextSibling;
kidFrame->GetNextSibling(nextSibling);
continuingFrame->SetNextSibling(nextSibling);
kidFrame->SetNextSibling(continuingFrame);
// Push it and the frames that follow
PushChildren(continuingFrame, kidFrame);
}
} else {
// See whether the row frame has cells that span into it or across it
PushChildren(kidFrame, prevKidFrame);

43
mozilla/layout/tables/nsTableRowGroupFrame.cpp
View File

@ -872,30 +872,31 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext& aPresContext,
rv = ReflowChild(kidFrame, aPresContext, desiredSize, kidReflowState, aStatus);
kidFrame->SizeTo(desiredSize.width, desiredSize.height);
NS_ASSERTION(NS_FRAME_IS_NOT_COMPLETE(aStatus), "unexpected status");
((nsTableRowFrame *)kidFrame)->DidResize(aPresContext, aReflowState);
// Create a continuing frame, add it to the child list, and then push it
// and the frames that follow
// XXX Check whether it already has a next-in-flow
nsIFrame* continuingFrame;
nsIStyleContext* kidSC;
kidFrame->GetStyleContext(kidSC);
kidFrame->CreateContinuingFrame(aPresContext, this, kidSC, continuingFrame);
NS_RELEASE(kidSC);
// Add it to the child list
nsIFrame* nextSibling;
kidFrame->GetNextSibling(nextSibling);
continuingFrame->SetNextSibling(nextSibling);
kidFrame->SetNextSibling(continuingFrame);
// Push it and the frames that follow
PushChildren(continuingFrame, kidFrame);
aDesiredSize.height = desiredSize.height;
if (NS_FRAME_IS_NOT_COMPLETE(aStatus)) {
// Create a continuing frame, add it to the child list, and then push it
// and the frames that follow
// XXX Check whether it already has a next-in-flow
nsIFrame* continuingFrame;
nsIStyleContext* kidSC;
kidFrame->GetStyleContext(kidSC);
kidFrame->CreateContinuingFrame(aPresContext, this, kidSC, continuingFrame);
NS_RELEASE(kidSC);
// Add it to the child list
nsIFrame* nextSibling;
kidFrame->GetNextSibling(nextSibling);
continuingFrame->SetNextSibling(nextSibling);
kidFrame->SetNextSibling(continuingFrame);
// Push it and the frames that follow
PushChildren(continuingFrame, kidFrame);
}
} else {
// See whether the row frame has cells that span into it or across it
PushChildren(kidFrame, prevKidFrame);