From c2e640288cc6fd78c8cca4422b05ab09fa2f902e Mon Sep 17 00:00:00 2001 From: Justin Dolske Date: Wed, 13 Aug 2008 20:49:57 -0700 Subject: [PATCH] Backed out changeset 7362e63c648e (relanding bug 449422) --- layout/tables/nsTableRowFrame.cpp | 3 +++ layout/tables/nsTableRowGroupFrame.cpp | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/layout/tables/nsTableRowFrame.cpp b/layout/tables/nsTableRowFrame.cpp index 929c59d2eeec..c83492085a55 100644 --- a/layout/tables/nsTableRowFrame.cpp +++ b/layout/tables/nsTableRowFrame.cpp @@ -164,6 +164,9 @@ nsTableRowFrame::Init(nsIContent* aContent, // Let the base class do its initialization rv = nsHTMLContainerFrame::Init(aContent, aParent, aPrevInFlow); + NS_ASSERTION(NS_STYLE_DISPLAY_TABLE_ROW == GetStyleDisplay()->mDisplay, + "wrong display on table row frame"); + if (aPrevInFlow) { // Set the row index nsTableRowFrame* rowFrame = (nsTableRowFrame*)aPrevInFlow; diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp index 0797247be095..15287087d9bb 100644 --- a/layout/tables/nsTableRowGroupFrame.cpp +++ b/layout/tables/nsTableRowGroupFrame.cpp @@ -1413,6 +1413,9 @@ nsTableRowGroupFrame::AppendFrames(nsIAtom* aListName, for (nsIFrame* rowFrame = aFrameList; rowFrame; rowFrame = rowFrame->GetNextSibling()) { if (nsGkAtoms::tableRowFrame == rowFrame->GetType()) { + NS_ASSERTION(NS_STYLE_DISPLAY_TABLE_ROW == + rowFrame->GetStyleDisplay()->mDisplay, + "wrong display type on rowframe"); rows.AppendElement(rowFrame); } } @@ -1456,6 +1459,9 @@ nsTableRowGroupFrame::InsertFrames(nsIAtom* aListName, for (nsIFrame* rowFrame = aFrameList; rowFrame; rowFrame = rowFrame->GetNextSibling()) { if (nsGkAtoms::tableRowFrame == rowFrame->GetType()) { + NS_ASSERTION(NS_STYLE_DISPLAY_TABLE_ROW == + rowFrame->GetStyleDisplay()->mDisplay, + "wrong display type on rowframe"); rows.AppendElement(rowFrame); if (!gotFirstRow) { ((nsTableRowFrame*)rowFrame)->SetFirstInserted(PR_TRUE);