From 82b376e12cff024e033d6c6c519af092df5e9baf Mon Sep 17 00:00:00 2001 From: "rbs%maths.uq.edu.au" Date: Thu, 3 Aug 2006 23:27:55 +0000 Subject: [PATCH] Backout earlier patch for bug 327737 due to regression git-svn-id: svn://10.0.0.236/trunk@206526 18797224-902f-48f8-a5cc-f745e15eee43 --- .../layout/mathml/base/src/nsIMathMLFrame.h | 23 ++++++------- .../base/src/nsMathMLContainerFrame.cpp | 10 ++---- .../mathml/base/src/nsMathMLContainerFrame.h | 6 ++-- .../layout/mathml/base/src/nsMathMLFrame.h | 8 ++--- .../mathml/base/src/nsMathMLmactionFrame.cpp | 8 ++--- .../mathml/base/src/nsMathMLmactionFrame.h | 8 ++--- .../mathml/base/src/nsMathMLmfracFrame.cpp | 10 +++--- .../mathml/base/src/nsMathMLmfracFrame.h | 8 ++--- .../base/src/nsMathMLmmultiscriptsFrame.cpp | 12 +++---- .../base/src/nsMathMLmmultiscriptsFrame.h | 8 ++--- .../mathml/base/src/nsMathMLmoverFrame.cpp | 12 +++---- .../mathml/base/src/nsMathMLmoverFrame.h | 8 ++--- .../mathml/base/src/nsMathMLmrootFrame.cpp | 2 +- .../mathml/base/src/nsMathMLmsubFrame.cpp | 30 +++++++---------- .../mathml/base/src/nsMathMLmsubFrame.h | 24 ++++++-------- .../mathml/base/src/nsMathMLmsubsupFrame.cpp | 32 +++++++------------ .../mathml/base/src/nsMathMLmsubsupFrame.h | 26 +++++++-------- .../mathml/base/src/nsMathMLmsupFrame.cpp | 30 +++++++---------- .../mathml/base/src/nsMathMLmsupFrame.h | 24 ++++++-------- .../mathml/base/src/nsMathMLmunderFrame.cpp | 12 +++---- .../mathml/base/src/nsMathMLmunderFrame.h | 8 ++--- .../base/src/nsMathMLmunderoverFrame.cpp | 12 +++---- .../mathml/base/src/nsMathMLmunderoverFrame.h | 8 ++--- 23 files changed, 124 insertions(+), 205 deletions(-) diff --git a/mozilla/layout/mathml/base/src/nsIMathMLFrame.h b/mozilla/layout/mathml/base/src/nsIMathMLFrame.h index 4131f6d1cd9..314dc64fcb3 100644 --- a/mozilla/layout/mathml/base/src/nsIMathMLFrame.h +++ b/mozilla/layout/mathml/base/src/nsIMathMLFrame.h @@ -45,11 +45,12 @@ struct nsPresentationData; struct nsEmbellishData; struct nsHTMLReflowMetrics; -// a781ed45-4338-43cb-9739-a7a8f8418ff3 -#define NS_IMATHMLFRAME_IID \ -{ 0xa781ed45, 0x4338, 0x43cb, \ - { 0x97, 0x39, 0xa7, 0xa8, 0xf8, 0x41, 0x8f, 0xf3 } } - +// IID for the nsIMathMLFrame interface (the IID was taken from IIDS.h) +/* a6cf9113-15b3-11d2-932e-00805f8add32 */ +#define NS_IMATHMLFRAME_IID \ +{ 0xa6cf9113, 0x15b3, 0x11d2, \ + { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } + static NS_DEFINE_IID(kIMathMLFrameIID, NS_IMATHMLFRAME_IID); // Abstract base class that provides additional methods for MathML frames @@ -136,17 +137,11 @@ public: * desired size and your ascent/descent info. Compute your desired size * using the information in your children's rectangles, and include any * space you want for border/padding in the desired size you return. - * - * @param aReflowState [out] forwarded argument from Reflow() - * - * @param aStatus [out] forwarded argument from Reflow() */ NS_IMETHOD - Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) = 0; + Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize) = 0; /* GetEmbellishData/SetEmbellishData : * Get/Set the mEmbellishData member variable. diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp index c8b9c58aede..57ae475d973 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp @@ -83,10 +83,8 @@ NS_IMPL_QUERY_INTERFACE_INHERITED1(nsMathMLContainerFrame, nsHTMLContainerFrame, // error handlers // provide a feedback to the user when a frame with bad markup can not be rendered nsresult -nsMathMLContainerFrame::ReflowError(nsIRenderingContext& aRenderingContext, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) +nsMathMLContainerFrame::ReflowError(nsIRenderingContext& aRenderingContext, + nsHTMLReflowMetrics& aDesiredSize) { nsresult rv; @@ -107,8 +105,6 @@ nsMathMLContainerFrame::ReflowError(nsIRenderingContext& aRenderingContext, NS_WARNING("GetBoundingMetrics failed"); aDesiredSize.width = aDesiredSize.height = 0; aDesiredSize.ascent = aDesiredSize.descent = 0; - aStatus = NS_FRAME_COMPLETE; - NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize); return NS_OK; } @@ -126,8 +122,6 @@ nsMathMLContainerFrame::ReflowError(nsIRenderingContext& aRenderingContext, // Also return our bounding metrics aDesiredSize.mBoundingMetrics = mBoundingMetrics; - aStatus = NS_FRAME_COMPLETE; - NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize); return NS_OK; } diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h index e86c479a953..c77bbd9c026 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h @@ -202,10 +202,8 @@ public: // error handlers to provide a visual feedback to the user when an error // (typically invalid markup) was encountered during reflow. virtual nsresult - ReflowError(nsIRenderingContext& aRenderingContext, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus); + ReflowError(nsIRenderingContext& aRenderingContext, + nsHTMLReflowMetrics& aDesiredSize); // helper method to reflow a child frame. We are inline frames, and we don't // know our positions until reflow is finished. That's why we ask the diff --git a/mozilla/layout/mathml/base/src/nsMathMLFrame.h b/mozilla/layout/mathml/base/src/nsMathMLFrame.h index 8600156ff34..7259e345d54 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLFrame.h @@ -105,11 +105,9 @@ public: } NS_IMETHOD - Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) + Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize) { return NS_OK; } diff --git a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp index 916be560a78..16ceadac9bb 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp @@ -315,11 +315,9 @@ nsMathMLmactionFrame::Reflow(nsPresContext* aPresContext, // Only place the selected child ... NS_IMETHODIMP -nsMathMLmactionFrame::Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) +nsMathMLmactionFrame::Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize) { aDesiredSize.width = aDesiredSize.height = 0; aDesiredSize.ascent = aDesiredSize.descent = 0; diff --git a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.h index 1c27271f6dd..5c7d8d61cf4 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.h @@ -77,11 +77,9 @@ public: const nsDisplayListSet& aLists); NS_IMETHOD - Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus); + Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize); NS_IMETHOD Reflow(nsPresContext* aPresContext, diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp index 534c845dcc1..b0ff8b8bdbf 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp @@ -264,11 +264,9 @@ nsMathMLmfracFrame::FixInterFrameSpacing(nsHTMLReflowMetrics& aDesiredSize) } NS_IMETHODIMP -nsMathMLmfracFrame::Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) +nsMathMLmfracFrame::Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize) { //////////////////////////////////// // Get the children's desired sizes @@ -282,7 +280,7 @@ nsMathMLmfracFrame::Place(nsIRenderingContext& aRenderingContext, if (!frameNum || !frameDen || frameDen->GetNextSibling()) { // report an error, encourage people to get their markups in order NS_WARNING("invalid markup"); - return ReflowError(aRenderingContext, aDesiredSize, aReflowState, aStatus); + return ReflowError(aRenderingContext, aDesiredSize); } GetReflowAndBoundingMetricsFor(frameNum, sizeNum, bmNum); GetReflowAndBoundingMetricsFor(frameDen, sizeDen, bmDen); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h index b201845d309..5afb0134617 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h @@ -112,11 +112,9 @@ public: nsReflowStatus& aStatus); NS_IMETHOD - Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus); + Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize); NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder, const nsRect& aDirtyRect, diff --git a/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.cpp index 8af708922a3..0f011a20bec 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.cpp @@ -141,11 +141,9 @@ nsMathMLmmultiscriptsFrame::ProcessAttributes() } NS_IMETHODIMP -nsMathMLmmultiscriptsFrame::Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) +nsMathMLmmultiscriptsFrame::Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize) { //////////////////////////////////// // Get the children's desired sizes @@ -270,7 +268,7 @@ nsMathMLmmultiscriptsFrame::Place(nsIRenderingContext& aRenderingContext, // duplicate found // report an error, encourage people to get their markups in order NS_WARNING("invalid markup"); - return ReflowError(aRenderingContext, aDesiredSize, aReflowState, aStatus); + return ReflowError(aRenderingContext, aDesiredSize); } mprescriptsFrame = childFrame; firstPrescriptsPair = PR_TRUE; @@ -381,7 +379,7 @@ nsMathMLmmultiscriptsFrame::Place(nsIRenderingContext& aRenderingContext, if ((0 != width) || !baseFrame || !subScriptFrame || !supScriptFrame) { // report an error, encourage people to get their markups in order NS_WARNING("invalid markup"); - return ReflowError(aRenderingContext, aDesiredSize, aReflowState, aStatus); + return ReflowError(aRenderingContext, aDesiredSize); } // we left out the width of prescripts, so ... diff --git a/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.h index 8dc9ecd5237..33e7c7f864a 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.h @@ -55,11 +55,9 @@ public: TransmitAutomaticData(); NS_IMETHOD - Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus); + Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize); protected: nsMathMLmmultiscriptsFrame(nsStyleContext* aContext) : nsMathMLContainerFrame(aContext) {} diff --git a/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp index 7de9598c134..57d185e5c99 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp @@ -249,11 +249,9 @@ i.e.: */ NS_IMETHODIMP -nsMathMLmoverFrame::Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) +nsMathMLmoverFrame::Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize) { if ( NS_MATHML_EMBELLISH_IS_MOVABLELIMITS(mEmbellishData.flags) && !NS_MATHML_IS_DISPLAYSTYLE(mPresentationData.flags)) { @@ -262,8 +260,6 @@ nsMathMLmoverFrame::Place(nsIRenderingContext& aRenderingContext, aRenderingContext, aPlaceOrigin, aDesiredSize, - aReflowState, - aStatus, this); } @@ -280,7 +276,7 @@ nsMathMLmoverFrame::Place(nsIRenderingContext& aRenderingContext, if (!baseFrame || !overFrame || overFrame->GetNextSibling()) { // report an error, encourage people to get their markups in order NS_WARNING("invalid markup"); - return ReflowError(aRenderingContext, aDesiredSize, aReflowState, aStatus); + return ReflowError(aRenderingContext, aDesiredSize); } GetReflowAndBoundingMetricsFor(baseFrame, baseSize, bmBase); GetReflowAndBoundingMetricsFor(overFrame, overSize, bmOver); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.h index a4c187e3d90..f62e366b171 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.h @@ -52,11 +52,9 @@ public: friend nsIFrame* NS_NewMathMLmoverFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); NS_IMETHOD - Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus); + Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize); NS_IMETHOD InheritAutomaticData(nsIFrame* aParent); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.cpp index 8da3f073f30..bbf2ab111ec 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.cpp @@ -210,7 +210,7 @@ nsMathMLmrootFrame::Reflow(nsPresContext* aPresContext, if (2 != count) { // report an error, encourage people to get their markups in order NS_WARNING("invalid markup"); - return ReflowError(renderingContext, aDesiredSize, aReflowState, aStatus); + return ReflowError(renderingContext, aDesiredSize); } //////////// diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp index c701fbad2aa..eed411203a6 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp @@ -82,11 +82,9 @@ nsMathMLmsubFrame::TransmitAutomaticData() } NS_IMETHODIMP -nsMathMLmsubFrame::Place (nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) +nsMathMLmsubFrame::Place (nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize) { // extra spacing after sup/subscript nscoord scriptSpace = NSFloatPointsToTwips(0.5f); // 0.5pt as in plain TeX @@ -107,8 +105,6 @@ nsMathMLmsubFrame::Place (nsIRenderingContext& aRenderingContext, aRenderingContext, aPlaceOrigin, aDesiredSize, - aReflowState, - aStatus, this, subScriptShift, scriptSpace); @@ -117,15 +113,13 @@ nsMathMLmsubFrame::Place (nsIRenderingContext& aRenderingContext, // exported routine that both munder and msub share. // munder uses this when movablelimits is set. nsresult -nsMathMLmsubFrame::PlaceSubScript (nsPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus, - nsIFrame* aFrame, - nscoord aUserSubScriptShift, - nscoord aScriptSpace) +nsMathMLmsubFrame::PlaceSubScript (nsPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize, + nsIFrame* aFrame, + nscoord aUserSubScriptShift, + nscoord aScriptSpace) { // the caller better be a mathml frame nsIMathMLFrame* mathMLFrame; @@ -150,9 +144,7 @@ nsMathMLmsubFrame::PlaceSubScript (nsPresContext* aPresContext, NS_WARNING("invalid markup"); return NS_STATIC_CAST(nsMathMLContainerFrame*, aFrame)->ReflowError(aRenderingContext, - aDesiredSize, - aReflowState, - aStatus); + aDesiredSize); } GetReflowAndBoundingMetricsFor(baseFrame, baseSize, bmBase); GetReflowAndBoundingMetricsFor(subScriptFrame, subScriptSize, bmSubScript); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.h index fa5d26297d9..fbe5d79bb6c 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.h @@ -55,22 +55,18 @@ public: TransmitAutomaticData(); NS_IMETHOD - Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus); + Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize); static nsresult - PlaceSubScript (nsPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus, - nsIFrame* aForFrame, - nscoord aUserSubScriptShift = 0, - nscoord aScriptSpace = NSFloatPointsToTwips(0.5f)); + PlaceSubScript (nsPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize, + nsIFrame* aForFrame, + nscoord aUserSubScriptShift = 0, + nscoord aScriptSpace = NSFloatPointsToTwips(0.5f)); protected: nsMathMLmsubFrame(nsStyleContext* aContext) : nsMathMLContainerFrame(aContext) {} diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp index 11ab6de588e..00f59cacf16 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp @@ -87,11 +87,9 @@ nsMathMLmsubsupFrame::TransmitAutomaticData() } NS_IMETHODIMP -nsMathMLmsubsupFrame::Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) +nsMathMLmsubsupFrame::Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize) { // extra spacing between base and sup/subscript nscoord scriptSpace = 0; @@ -122,8 +120,6 @@ nsMathMLmsubsupFrame::Place(nsIRenderingContext& aRenderingContext, aRenderingContext, aPlaceOrigin, aDesiredSize, - aReflowState, - aStatus, this, subScriptShift, supScriptShift, @@ -133,16 +129,14 @@ nsMathMLmsubsupFrame::Place(nsIRenderingContext& aRenderingContext, // exported routine that both munderover and msubsup share. // munderover uses this when movablelimits is set. nsresult -nsMathMLmsubsupFrame::PlaceSubSupScript(nsPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus, - nsIFrame* aFrame, - nscoord aUserSubScriptShift, - nscoord aUserSupScriptShift, - nscoord aScriptSpace) +nsMathMLmsubsupFrame::PlaceSubSupScript(nsPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize, + nsIFrame* aFrame, + nscoord aUserSubScriptShift, + nscoord aUserSupScriptShift, + nscoord aScriptSpace) { // the caller better be a mathml frame nsIMathMLFrame* mathMLFrame; @@ -173,9 +167,7 @@ nsMathMLmsubsupFrame::PlaceSubSupScript(nsPresContext* aPresContext, NS_WARNING("invalid markup"); return NS_STATIC_CAST(nsMathMLContainerFrame*, aFrame)->ReflowError(aRenderingContext, - aDesiredSize, - aReflowState, - aStatus); + aDesiredSize); } GetReflowAndBoundingMetricsFor(baseFrame, baseSize, bmBase); GetReflowAndBoundingMetricsFor(subScriptFrame, subScriptSize, bmSubScript); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.h index d8e8d005a26..c3f38a0c084 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.h @@ -55,23 +55,19 @@ public: TransmitAutomaticData(); NS_IMETHOD - Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus); + Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize); static nsresult - PlaceSubSupScript(nsPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus, - nsIFrame* aForFrame, - nscoord aUserSubScriptShift = 0, - nscoord aUserSupScriptShift = 0, - nscoord aScriptSpace = NSFloatPointsToTwips(0.5f)); + PlaceSubSupScript(nsPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize, + nsIFrame* aForFrame, + nscoord aUserSubScriptShift = 0, + nscoord aUserSupScriptShift = 0, + nscoord aScriptSpace = NSFloatPointsToTwips(0.5f)); protected: nsMathMLmsubsupFrame(nsStyleContext* aContext) : nsMathMLContainerFrame(aContext) {} diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.cpp index e01d6ff6f4c..afa7639cf8a 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.cpp @@ -82,11 +82,9 @@ nsMathMLmsupFrame::TransmitAutomaticData() } NS_IMETHODIMP -nsMathMLmsupFrame::Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) +nsMathMLmsupFrame::Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize) { // extra spacing after sup/subscript nscoord scriptSpace = NSFloatPointsToTwips(0.5f); // 0.5pt as in plain TeX @@ -107,8 +105,6 @@ nsMathMLmsupFrame::Place(nsIRenderingContext& aRenderingContext, aRenderingContext, aPlaceOrigin, aDesiredSize, - aReflowState, - aStatus, this, supScriptShift, scriptSpace); @@ -117,15 +113,13 @@ nsMathMLmsupFrame::Place(nsIRenderingContext& aRenderingContext, // exported routine that both mover and msup share. // mover uses this when movablelimits is set. nsresult -nsMathMLmsupFrame::PlaceSuperScript(nsPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus, - nsIFrame* aFrame, - nscoord aUserSupScriptShift, - nscoord aScriptSpace) +nsMathMLmsupFrame::PlaceSuperScript(nsPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize, + nsIFrame* aFrame, + nscoord aUserSupScriptShift, + nscoord aScriptSpace) { // the caller better be a mathml frame nsIMathMLFrame* mathMLFrame; @@ -151,9 +145,7 @@ nsMathMLmsupFrame::PlaceSuperScript(nsPresContext* aPresContext, NS_WARNING("invalid markup"); return NS_STATIC_CAST(nsMathMLContainerFrame*, aFrame)->ReflowError(aRenderingContext, - aDesiredSize, - aReflowState, - aStatus); + aDesiredSize); } GetReflowAndBoundingMetricsFor(baseFrame, baseSize, bmBase); GetReflowAndBoundingMetricsFor(supScriptFrame, supScriptSize, bmSupScript); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.h index b6e3d0d770d..18f6d40ded2 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.h @@ -55,22 +55,18 @@ public: TransmitAutomaticData(); NS_IMETHOD - Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus); + Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize); static nsresult - PlaceSuperScript (nsPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus, - nsIFrame* aForFrame, - nscoord aUserSupScriptShift = 0, - nscoord aScriptSpace = NSFloatPointsToTwips(0.5f)); + PlaceSuperScript (nsPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize, + nsIFrame* aForFrame, + nscoord aUserSupScriptShift = 0, + nscoord aScriptSpace = NSFloatPointsToTwips(0.5f)); protected: nsMathMLmsupFrame(nsStyleContext* aContext) : nsMathMLContainerFrame(aContext) {} diff --git a/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.cpp index f51c6e84bf0..6ec89811bdf 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.cpp @@ -246,11 +246,9 @@ i.e.,: */ NS_IMETHODIMP -nsMathMLmunderFrame::Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) +nsMathMLmunderFrame::Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize) { if ( NS_MATHML_EMBELLISH_IS_MOVABLELIMITS(mEmbellishData.flags) && !NS_MATHML_IS_DISPLAYSTYLE(mPresentationData.flags)) { @@ -259,8 +257,6 @@ nsMathMLmunderFrame::Place(nsIRenderingContext& aRenderingContext, aRenderingContext, aPlaceOrigin, aDesiredSize, - aReflowState, - aStatus, this); } @@ -277,7 +273,7 @@ nsMathMLmunderFrame::Place(nsIRenderingContext& aRenderingContext, if (!baseFrame || !underFrame || underFrame->GetNextSibling()) { // report an error, encourage people to get their markups in order NS_WARNING("invalid markup"); - return ReflowError(aRenderingContext, aDesiredSize, aReflowState, aStatus); + return ReflowError(aRenderingContext, aDesiredSize); } GetReflowAndBoundingMetricsFor(baseFrame, baseSize, bmBase); GetReflowAndBoundingMetricsFor(underFrame, underSize, bmUnder); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.h index 6394b06dc4c..794f1c0e838 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.h @@ -52,11 +52,9 @@ public: friend nsIFrame* NS_NewMathMLmunderFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); NS_IMETHOD - Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus); + Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize); NS_IMETHOD InheritAutomaticData(nsIFrame* aParent); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.cpp index ed249b8cd87..ca386d4e690 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.cpp @@ -283,11 +283,9 @@ i.e.,: */ NS_IMETHODIMP -nsMathMLmunderoverFrame::Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) +nsMathMLmunderoverFrame::Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize) { if ( NS_MATHML_EMBELLISH_IS_MOVABLELIMITS(mEmbellishData.flags) && !NS_MATHML_IS_DISPLAYSTYLE(mPresentationData.flags)) { @@ -296,8 +294,6 @@ nsMathMLmunderoverFrame::Place(nsIRenderingContext& aRenderingContext, aRenderingContext, aPlaceOrigin, aDesiredSize, - aReflowState, - aStatus, this); } @@ -318,7 +314,7 @@ nsMathMLmunderoverFrame::Place(nsIRenderingContext& aRenderingContext, if (!baseFrame || !underFrame || !overFrame || overFrame->GetNextSibling()) { // report an error, encourage people to get their markups in order NS_WARNING("invalid markup"); - return ReflowError(aRenderingContext, aDesiredSize, aReflowState, aStatus); + return ReflowError(aRenderingContext, aDesiredSize); } GetReflowAndBoundingMetricsFor(baseFrame, baseSize, bmBase); GetReflowAndBoundingMetricsFor(underFrame, underSize, bmUnder); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.h index 032389683fa..bf1c4aae138 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.h @@ -52,11 +52,9 @@ public: friend nsIFrame* NS_NewMathMLmunderoverFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); NS_IMETHOD - Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus); + Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize); NS_IMETHOD InheritAutomaticData(nsIFrame* aParent);