From 2a99fa3eecc6ba0ebeff1cb6572ab46853411241 Mon Sep 17 00:00:00 2001 From: "rbs%maths.uq.edu.au" Date: Tue, 28 Mar 2000 09:32:54 +0000 Subject: [PATCH] [#ifdef MOZ_MATHML: NOT PART OF THE DEFAULT BUILD]. Update a MathML hook for git-svn-id: svn://10.0.0.236/trunk@64350 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsCSSFrameConstructor.cpp | 15 +++++++++++---- .../html/style/src/nsCSSFrameConstructor.cpp | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 2e09c062c7d..d7647f0c1b5 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -541,12 +541,19 @@ nsTreeCreator::CreateTableCellInnerFrame(nsIFrame** aNewFrame) { // Structure used when creating MathML mtable frames struct nsMathMLmtableCreator: public nsTableCreator { - nsresult CreateTableCellInnerFrame(nsIFrame** aNewFrame); + virtual nsresult CreateTableOuterFrame(nsIFrame** aNewFrame); + virtual nsresult CreateTableCellInnerFrame(nsIFrame** aNewFrame); nsMathMLmtableCreator(nsIPresShell* aPresShell) :nsTableCreator(aPresShell) {}; }; +nsresult +nsMathMLmtableCreator::CreateTableOuterFrame(nsIFrame** aNewFrame) +{ + return NS_NewMathMLmtableOuterFrame(mPresShell, aNewFrame); +} + nsresult nsMathMLmtableCreator::CreateTableCellInnerFrame(nsIFrame** aNewFrame) { @@ -5953,8 +5960,9 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell, if (aTag == nsMathMLAtoms::mi_) rv = NS_NewMathMLmiFrame(aPresShell, &newFrame); - else if (aTag == nsMathMLAtoms::mn_) - rv = NS_NewMathMLmnFrame(aPresShell, &newFrame); + else if (aTag == nsMathMLAtoms::mtext_ || + aTag == nsMathMLAtoms::mn_) + rv = NS_NewMathMLmtextFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mo_) rv = NS_NewMathMLmoFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mfrac_) @@ -5992,7 +6000,6 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell, else if (aTag == nsMathMLAtoms::maction_) rv = NS_NewMathMLmactionFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mrow_ || - aTag == nsMathMLAtoms::mtext_ || aTag == nsMathMLAtoms::merror_ || aTag == nsMathMLAtoms::none_ || aTag == nsMathMLAtoms::mprescripts_ ) diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index 2e09c062c7d..d7647f0c1b5 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -541,12 +541,19 @@ nsTreeCreator::CreateTableCellInnerFrame(nsIFrame** aNewFrame) { // Structure used when creating MathML mtable frames struct nsMathMLmtableCreator: public nsTableCreator { - nsresult CreateTableCellInnerFrame(nsIFrame** aNewFrame); + virtual nsresult CreateTableOuterFrame(nsIFrame** aNewFrame); + virtual nsresult CreateTableCellInnerFrame(nsIFrame** aNewFrame); nsMathMLmtableCreator(nsIPresShell* aPresShell) :nsTableCreator(aPresShell) {}; }; +nsresult +nsMathMLmtableCreator::CreateTableOuterFrame(nsIFrame** aNewFrame) +{ + return NS_NewMathMLmtableOuterFrame(mPresShell, aNewFrame); +} + nsresult nsMathMLmtableCreator::CreateTableCellInnerFrame(nsIFrame** aNewFrame) { @@ -5953,8 +5960,9 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell, if (aTag == nsMathMLAtoms::mi_) rv = NS_NewMathMLmiFrame(aPresShell, &newFrame); - else if (aTag == nsMathMLAtoms::mn_) - rv = NS_NewMathMLmnFrame(aPresShell, &newFrame); + else if (aTag == nsMathMLAtoms::mtext_ || + aTag == nsMathMLAtoms::mn_) + rv = NS_NewMathMLmtextFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mo_) rv = NS_NewMathMLmoFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mfrac_) @@ -5992,7 +6000,6 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell, else if (aTag == nsMathMLAtoms::maction_) rv = NS_NewMathMLmactionFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mrow_ || - aTag == nsMathMLAtoms::mtext_ || aTag == nsMathMLAtoms::merror_ || aTag == nsMathMLAtoms::none_ || aTag == nsMathMLAtoms::mprescripts_ )