From f59867d4dfc19573c020b1e124e365801ab0dbee Mon Sep 17 00:00:00 2001 From: "rbs%maths.uq.edu.au" Date: Wed, 27 Feb 2002 01:37:13 +0000 Subject: [PATCH] bug 127227 - rowspan and columnspan regressed in MathML mtable - a spill over from the landing of the table border collapsing code in bug 41262, r=karnaze, sr=attinasi, a=shaver git-svn-id: svn://10.0.0.236/trunk@115400 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsCSSFrameConstructor.cpp | 6 ++++-- mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 8745fa0f905..111518ff38d 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -957,7 +957,7 @@ struct nsMathMLmtableCreator: public nsTableCreator { virtual nsresult CreateTableOuterFrame(nsIFrame** aNewFrame); virtual nsresult CreateTableFrame(nsIFrame** aNewFrame); virtual nsresult CreateTableRowFrame(nsIFrame** aNewFrame); - virtual nsresult CreateTableCellFrame(nsIFrame** aNewFrame); + virtual nsresult CreateTableCellFrame(nsIFrame* aParentFrame, nsIFrame** aNewFrame); virtual nsresult CreateTableCellInnerFrame(nsIFrame** aNewFrame); nsMathMLmtableCreator(nsIPresShell* aPresShell) @@ -983,8 +983,10 @@ nsMathMLmtableCreator::CreateTableRowFrame(nsIFrame** aNewFrame) } nsresult -nsMathMLmtableCreator::CreateTableCellFrame(nsIFrame** aNewFrame) +nsMathMLmtableCreator::CreateTableCellFrame(nsIFrame* aParentFrame, + nsIFrame** aNewFrame) { + NS_ASSERTION(!IsBorderCollapse(aParentFrame), "not implemented"); return NS_NewMathMLmtdFrame(mPresShell, aNewFrame); } diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index 8745fa0f905..111518ff38d 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -957,7 +957,7 @@ struct nsMathMLmtableCreator: public nsTableCreator { virtual nsresult CreateTableOuterFrame(nsIFrame** aNewFrame); virtual nsresult CreateTableFrame(nsIFrame** aNewFrame); virtual nsresult CreateTableRowFrame(nsIFrame** aNewFrame); - virtual nsresult CreateTableCellFrame(nsIFrame** aNewFrame); + virtual nsresult CreateTableCellFrame(nsIFrame* aParentFrame, nsIFrame** aNewFrame); virtual nsresult CreateTableCellInnerFrame(nsIFrame** aNewFrame); nsMathMLmtableCreator(nsIPresShell* aPresShell) @@ -983,8 +983,10 @@ nsMathMLmtableCreator::CreateTableRowFrame(nsIFrame** aNewFrame) } nsresult -nsMathMLmtableCreator::CreateTableCellFrame(nsIFrame** aNewFrame) +nsMathMLmtableCreator::CreateTableCellFrame(nsIFrame* aParentFrame, + nsIFrame** aNewFrame) { + NS_ASSERTION(!IsBorderCollapse(aParentFrame), "not implemented"); return NS_NewMathMLmtdFrame(mPresShell, aNewFrame); }