corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed some XXX code that was temporary, but I forgot to delete

Browse Source
This commit is contained in:
troy@netscape.com
1999-02-19 02:05:00 +00:00
parent 416f82120a
commit ca1448aa51
2 changed files with 4 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
layout/html/table/src/nsTableRowFrame.cpp
View File

@@ -578,16 +578,8 @@ NS_METHOD nsTableRowFrame::ResizeReflow(nsIPresContext& aPresContext,
(availWidth != ((nsTableCellFrame *)kidFrame)->GetPriorAvailWidth()) || (availWidth != ((nsTableCellFrame *)kidFrame)->GetPriorAvailWidth()) ||
(nsnull != kidNextInFlow)) (nsnull != kidNextInFlow))
{ {
// XXX TROY
#if 0
// Always let the cell be as high as it wants. We ignore the height that's
// passed in and always place the entire row. Let the row group decide
// whether we fit or wehther the entire row is pushed
nsSize kidAvailSize(availWidth, NS_UNCONSTRAINEDSIZE);
#else
// Reflow the cell to fit the available height // Reflow the cell to fit the available height
nsSize kidAvailSize(availWidth, aReflowState.reflowState.availableHeight); nsSize kidAvailSize(availWidth, aReflowState.reflowState.availableHeight);
#endif
// Reflow the child // Reflow the child
nsHTMLReflowState kidReflowState(aPresContext, kidFrame, nsHTMLReflowState kidReflowState(aPresContext, kidFrame,
@@ -604,15 +596,10 @@ NS_METHOD nsTableRowFrame::ResizeReflow(nsIPresContext& aPresContext,
desiredSize.width, availWidth); desiredSize.width, availWidth);
} }
#endif #endif
// XXX TROY
#if 0
NS_ASSERTION(NS_FRAME_IS_COMPLETE(status), "unexpected reflow status");
#else
// If any of the cells are not complete, then we're not complete // If any of the cells are not complete, then we're not complete
if (NS_FRAME_IS_NOT_COMPLETE(status)) { if (NS_FRAME_IS_NOT_COMPLETE(status)) {
aStatus = NS_FRAME_NOT_COMPLETE; aStatus = NS_FRAME_NOT_COMPLETE;
} }
#endif
if (gsDebug) if (gsDebug)
{ {
@@ -772,8 +759,8 @@ nsTableRowFrame::InitialReflow(nsIPresContext& aPresContext,
kidFrame->GetStyleData(eStyleStruct_Spacing , ((const nsStyleStruct *&)cellSpacingStyle)); kidFrame->GetStyleData(eStyleStruct_Spacing , ((const nsStyleStruct *&)cellSpacingStyle));
cellSpacingStyle->CalcBorderPaddingFor(kidFrame, borderPadding); cellSpacingStyle->CalcBorderPaddingFor(kidFrame, borderPadding);
// Because we're not splittable always allow the child to be as high as // For the initial reflow always allow the child to be as high as it
// it wants. The default available width is also unconstrained so we can // wants. The default available width is also unconstrained so we can
// get the child's maximum width // get the child's maximum width
nsSize kidAvailSize; nsSize kidAvailSize;
nsHTMLReflowMetrics kidSize(nsnull); nsHTMLReflowMetrics kidSize(nsnull);
@@ -1421,12 +1408,6 @@ nsTableRowFrame::Reflow(nsIPresContext& aPresContext,
break; break;
} }
// XXX TROY
#if 0
aStatus = NS_FRAME_COMPLETE; // we're never continued
#endif
if (gsDebug==PR_TRUE) if (gsDebug==PR_TRUE)
{ {
if (nsnull!=aDesiredSize.maxElementSize) if (nsnull!=aDesiredSize.maxElementSize)

23
layout/tables/nsTableRowFrame.cpp
View File

@@ -578,16 +578,8 @@ NS_METHOD nsTableRowFrame::ResizeReflow(nsIPresContext& aPresContext,
(availWidth != ((nsTableCellFrame *)kidFrame)->GetPriorAvailWidth()) || (availWidth != ((nsTableCellFrame *)kidFrame)->GetPriorAvailWidth()) ||
(nsnull != kidNextInFlow)) (nsnull != kidNextInFlow))
{ {
// XXX TROY
#if 0
// Always let the cell be as high as it wants. We ignore the height that's
// passed in and always place the entire row. Let the row group decide
// whether we fit or wehther the entire row is pushed
nsSize kidAvailSize(availWidth, NS_UNCONSTRAINEDSIZE);
#else
// Reflow the cell to fit the available height // Reflow the cell to fit the available height
nsSize kidAvailSize(availWidth, aReflowState.reflowState.availableHeight); nsSize kidAvailSize(availWidth, aReflowState.reflowState.availableHeight);
#endif
// Reflow the child // Reflow the child
nsHTMLReflowState kidReflowState(aPresContext, kidFrame, nsHTMLReflowState kidReflowState(aPresContext, kidFrame,
@@ -604,15 +596,10 @@ NS_METHOD nsTableRowFrame::ResizeReflow(nsIPresContext& aPresContext,
desiredSize.width, availWidth); desiredSize.width, availWidth);
} }
#endif #endif
// XXX TROY
#if 0
NS_ASSERTION(NS_FRAME_IS_COMPLETE(status), "unexpected reflow status");
#else
// If any of the cells are not complete, then we're not complete // If any of the cells are not complete, then we're not complete
if (NS_FRAME_IS_NOT_COMPLETE(status)) { if (NS_FRAME_IS_NOT_COMPLETE(status)) {
aStatus = NS_FRAME_NOT_COMPLETE; aStatus = NS_FRAME_NOT_COMPLETE;
} }
#endif
if (gsDebug) if (gsDebug)
{ {
@@ -772,8 +759,8 @@ nsTableRowFrame::InitialReflow(nsIPresContext& aPresContext,
kidFrame->GetStyleData(eStyleStruct_Spacing , ((const nsStyleStruct *&)cellSpacingStyle)); kidFrame->GetStyleData(eStyleStruct_Spacing , ((const nsStyleStruct *&)cellSpacingStyle));
cellSpacingStyle->CalcBorderPaddingFor(kidFrame, borderPadding); cellSpacingStyle->CalcBorderPaddingFor(kidFrame, borderPadding);
// Because we're not splittable always allow the child to be as high as // For the initial reflow always allow the child to be as high as it
// it wants. The default available width is also unconstrained so we can // wants. The default available width is also unconstrained so we can
// get the child's maximum width // get the child's maximum width
nsSize kidAvailSize; nsSize kidAvailSize;
nsHTMLReflowMetrics kidSize(nsnull); nsHTMLReflowMetrics kidSize(nsnull);
@@ -1421,12 +1408,6 @@ nsTableRowFrame::Reflow(nsIPresContext& aPresContext,
break; break;
} }
// XXX TROY
#if 0
aStatus = NS_FRAME_COMPLETE; // we're never continued
#endif
if (gsDebug==PR_TRUE) if (gsDebug==PR_TRUE)
{ {
if (nsnull!=aDesiredSize.maxElementSize) if (nsnull!=aDesiredSize.maxElementSize)