зеркало из https://github.com/mozilla/pjs.git
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
This commit is contained in:
Родитель
6e0b2ef372
Коммит
9716f085b4
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче