From fe90cdc817745264cb1eb1d9b1200a11f7d59464 Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Thu, 16 Jul 1998 22:15:02 +0000 Subject: [PATCH] Fix incremental reflow bug git-svn-id: svn://10.0.0.236/trunk@5748 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/table/src/nsTableCellFrame.cpp | 8 ++++++++ mozilla/layout/tables/nsTableCellFrame.cpp | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp index 136c4588a38..3615f2b3ccf 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableCellFrame.cpp @@ -276,6 +276,14 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext& aPresContext, if (NS_UNCONSTRAINEDSIZE!=availSize.height) availSize.height -= topInset+bottomInset+margin.top+margin.bottom; + // XXX Kipp added this hack + if (eReflowReason_Incremental == aReflowState.reason) { + // XXX We *must* do this otherwise incremental reflow that's + // passing through will not work right. + nsIFrame* next; + aReflowState.reflowCommand->GetNext(next); + } + // Try to reflow the child into the available space. It might not // fit or might need continuing. if (availSize.height < 0) diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index 136c4588a38..3615f2b3ccf 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/layout/tables/nsTableCellFrame.cpp @@ -276,6 +276,14 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext& aPresContext, if (NS_UNCONSTRAINEDSIZE!=availSize.height) availSize.height -= topInset+bottomInset+margin.top+margin.bottom; + // XXX Kipp added this hack + if (eReflowReason_Incremental == aReflowState.reason) { + // XXX We *must* do this otherwise incremental reflow that's + // passing through will not work right. + nsIFrame* next; + aReflowState.reflowCommand->GetNext(next); + } + // Try to reflow the child into the available space. It might not // fit or might need continuing. if (availSize.height < 0)