From 67df0737ac804bd45e7ab33d66eea7f116a3e447 Mon Sep 17 00:00:00 2001 From: "karlt+%karlt.net" Date: Tue, 18 Mar 2008 04:52:49 +0000 Subject: [PATCH] Move Place() from nsIMathMLFrame to nsMathMLContainerFrame b=363240, r+sr=roc git-svn-id: svn://10.0.0.236/trunk@248044 18797224-902f-48f8-a5cc-f745e15eee43 --- .../layout/mathml/base/src/nsIMathMLFrame.h | 36 -------------- .../base/src/nsMathMLContainerFrame.cpp | 2 +- .../mathml/base/src/nsMathMLContainerFrame.h | 47 ++++++++++++++++--- .../mathml/base/src/nsMathMLTokenFrame.cpp | 2 +- .../mathml/base/src/nsMathMLTokenFrame.h | 2 +- .../mathml/base/src/nsMathMLmactionFrame.cpp | 2 +- .../mathml/base/src/nsMathMLmactionFrame.h | 2 +- .../mathml/base/src/nsMathMLmfracFrame.cpp | 2 +- .../mathml/base/src/nsMathMLmfracFrame.h | 2 +- .../base/src/nsMathMLmmultiscriptsFrame.cpp | 2 +- .../base/src/nsMathMLmmultiscriptsFrame.h | 2 +- .../mathml/base/src/nsMathMLmoverFrame.cpp | 2 +- .../mathml/base/src/nsMathMLmoverFrame.h | 2 +- .../mathml/base/src/nsMathMLmpaddedFrame.cpp | 2 +- .../mathml/base/src/nsMathMLmpaddedFrame.h | 2 +- .../mathml/base/src/nsMathMLmsqrtFrame.cpp | 2 +- .../mathml/base/src/nsMathMLmsqrtFrame.h | 2 +- .../mathml/base/src/nsMathMLmsubFrame.cpp | 2 +- .../mathml/base/src/nsMathMLmsubFrame.h | 2 +- .../mathml/base/src/nsMathMLmsubsupFrame.cpp | 2 +- .../mathml/base/src/nsMathMLmsubsupFrame.h | 2 +- .../mathml/base/src/nsMathMLmsupFrame.h | 2 +- .../mathml/base/src/nsMathMLmunderFrame.cpp | 2 +- .../mathml/base/src/nsMathMLmunderFrame.h | 2 +- .../base/src/nsMathMLmunderoverFrame.cpp | 2 +- .../mathml/base/src/nsMathMLmunderoverFrame.h | 2 +- 26 files changed, 64 insertions(+), 67 deletions(-) diff --git a/mozilla/layout/mathml/base/src/nsIMathMLFrame.h b/mozilla/layout/mathml/base/src/nsIMathMLFrame.h index 38a7045afe9..042616d7f9c 100644 --- a/mozilla/layout/mathml/base/src/nsIMathMLFrame.h +++ b/mozilla/layout/mathml/base/src/nsIMathMLFrame.h @@ -123,42 +123,6 @@ public: nsBoundingMetrics& aContainerSize, nsHTMLReflowMetrics& aDesiredStretchSize) = 0; - /* Place : - * This method is used before returning from Reflow(), or when a MathML frame - * has just been stretched. It is called to fine-tune the positions of the - * child frames, and other elements. - * - * IMPORTANT: For nsMathMLContainerFrames this method uses - * GetReflowAndBoundingMetricsFor() which must have been set up with - * SaveReflowAndBoundingMetricsFor(). - * - * The Place() method will use this information to compute the desired size - * of the frame. - * - * @param aPlaceOrigin [in] - * If aPlaceOrigin is false, compute your desired size using the - * information in your children's rectangles. However, upon return, - * the origins of your children should keep their ascent information, i.e., - * a child rect.x, and rect.y should still act like placeholders for the - * child's descent and ascent. - * - * If aPlaceOrigin is true, reflow is finished. You should position all - * your children, and return your desired size. You should now convert - * the origins of your child frames into the coordinate system - * expected by Gecko (which is relative to the upper-left - * corner of the parent) and use FinishReflowChild() on your children - * to complete post-reflow operations. - * - * @param aDesiredSize [out] parameter where you should return your - * 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. - */ - NS_IMETHOD - 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 10e71379b57..cf0296f92c7 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp @@ -1262,7 +1262,7 @@ private: } }; -NS_IMETHODIMP +/* virtual */ nsresult nsMathMLContainerFrame::Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize) diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h index 472d83c67f3..758c366faa3 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h @@ -82,11 +82,6 @@ public: nsBoundingMetrics& aContainerSize, nsHTMLReflowMetrics& aDesiredStretchSize); - NS_IMETHOD - Place(nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize); - NS_IMETHOD UpdatePresentationDataFromChildAt(PRInt32 aFirstIndex, PRInt32 aLastIndex, @@ -198,6 +193,41 @@ public: // -------------------------------------------------------------------------- // Additional methods +protected: + /* Place : + * This method is used to measure or position child frames and other + * elements. It may be called any number of times with aPlaceOrigin + * false to measure, and the final call of the Reflow process before + * returning from Reflow() or Stretch() will have aPlaceOrigin true + * to position the elements. + * + * IMPORTANT: This method uses GetReflowAndBoundingMetricsFor() which must + * have been set up with SaveReflowAndBoundingMetricsFor(). + * + * The Place() method will use this information to compute the desired size + * of the frame. + * + * @param aPlaceOrigin [in] + * If aPlaceOrigin is false, compute your desired size using the + * information from GetReflowAndBoundingMetricsFor. However, child + * frames or other elements should not be repositioned. + * + * If aPlaceOrigin is true, reflow is finished. You should position + * all your children, and return your desired size. You should now + * use FinishReflowChild() on your children to complete post-reflow + * operations. + * + * @param aDesiredSize [out] parameter where you should return your desired + * size and your ascent/descent info. Compute your desired size using + * the information from GetReflowAndBoundingMetricsFor, and include + * any space you want for border/padding in the desired size you + * return. + */ + virtual nsresult + Place(nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize); + // helper to re-sync the automatic data in our children and notify our parent to // reflow us when changes (e.g., append/insert/remove) happen in our child list virtual nsresult @@ -205,15 +235,16 @@ public: // helper to get the preferred size that a container frame should use to fire // the stretch on its stretchy child frames. - virtual void + void GetPreferredStretchSize(nsIRenderingContext& aRenderingContext, PRUint32 aOptions, nsStretchDirection aStretchDirection, nsBoundingMetrics& aPreferredStretchSize); +public: // error handlers to provide a visual feedback to the user when an error // (typically invalid markup) was encountered during reflow. - virtual nsresult + nsresult ReflowError(nsIRenderingContext& aRenderingContext, nsHTMLReflowMetrics& aDesiredSize); @@ -227,6 +258,7 @@ public: const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); +protected: // helper to add the inter-spacing when is the immediate parent. // Since we don't (yet) handle the root element ourselves, we need to // take special care of the inter-frame spacing on elements for which @@ -273,6 +305,7 @@ public: PRUint32 aFlagsValues, PRUint32 aFlagsToUpdate); +public: static void PropagatePresentationDataFromChildAt(nsIFrame* aParentFrame, PRInt32 aFirstChildIndex, diff --git a/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp index 4baa7fae5c2..5be14bb8243 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp @@ -192,7 +192,7 @@ nsMathMLTokenFrame::Reflow(nsPresContext* aPresContext, // For token elements, mBoundingMetrics is computed at the ReflowToken // pass, it is not computed here because our children may be text frames // that do not implement the GetBoundingMetrics() interface. -nsresult +/* virtual */ nsresult nsMathMLTokenFrame::Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize) diff --git a/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.h b/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.h index d773d94ed73..609763e953c 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.h @@ -67,7 +67,7 @@ public: const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); - NS_IMETHOD + virtual nsresult Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp index 30e3d10c34f..c212ce0f543 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp @@ -298,7 +298,7 @@ nsMathMLmactionFrame::Reflow(nsPresContext* aPresContext, } // Only place the selected child ... -NS_IMETHODIMP +/* virtual */ nsresult nsMathMLmactionFrame::Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize) diff --git a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.h index ab360ff7cef..0a31cfb48c7 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.h @@ -77,7 +77,7 @@ public: const nsRect& aDirtyRect, const nsDisplayListSet& aLists); - NS_IMETHOD + virtual nsresult Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp index e93fdcabd1a..e6503d36e9d 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp @@ -278,7 +278,7 @@ nsMathMLmfracFrame::FixInterFrameSpacing(nsHTMLReflowMetrics& aDesiredSize) return gap; } -NS_IMETHODIMP +/* virtual */ nsresult nsMathMLmfracFrame::Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize) diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h index c2b9548370a..e189b651abe 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h @@ -115,7 +115,7 @@ public: virtual nscoord GetIntrinsicWidth(nsIRenderingContext* aRenderingContext); - NS_IMETHOD + virtual nsresult Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.cpp index 23da493be49..e5a6a290ae9 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.cpp @@ -140,7 +140,7 @@ nsMathMLmmultiscriptsFrame::ProcessAttributes() } } -NS_IMETHODIMP +/* virtual */ nsresult nsMathMLmmultiscriptsFrame::Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize) diff --git a/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.h index c3d94e006bc..5ec865c5454 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmmultiscriptsFrame.h @@ -55,7 +55,7 @@ public: NS_IMETHOD TransmitAutomaticData(); - NS_IMETHOD + virtual nsresult Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp index bf42708ac7c..7f01a27da7c 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp @@ -243,7 +243,7 @@ i.e.: } */ -NS_IMETHODIMP +/* virtual */ nsresult nsMathMLmoverFrame::Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize) diff --git a/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.h index c28e33e0991..2eb8d44e672 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.h @@ -52,7 +52,7 @@ class nsMathMLmoverFrame : public nsMathMLContainerFrame { public: friend nsIFrame* NS_NewMathMLmoverFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); - NS_IMETHOD + virtual nsresult Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.cpp index 68ebd7137db..f261f2290c0 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.cpp @@ -373,7 +373,7 @@ nsMathMLmpaddedFrame::Reflow(nsPresContext* aPresContext, return rv; } -NS_IMETHODIMP +/* virtual */ nsresult nsMathMLmpaddedFrame::Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize) diff --git a/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.h index 517347b4e9a..c08f66ff6fe 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.h @@ -61,7 +61,7 @@ public: const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); - NS_IMETHOD + virtual nsresult Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.cpp index 19587d7600e..320839ccd38 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.cpp @@ -163,7 +163,7 @@ nsMathMLmsqrtFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, return rv; } -NS_IMETHODIMP +/* virtual */ nsresult nsMathMLmsqrtFrame::Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize) diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.h index 4e69700cb35..b274bfb606f 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.h @@ -87,7 +87,7 @@ public: nsIFrame* aParent, nsIFrame* aPrevInFlow); - NS_IMETHOD + virtual nsresult Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp index 340ec43e8c7..2c78589491c 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp @@ -81,7 +81,7 @@ nsMathMLmsubFrame::TransmitAutomaticData() return NS_OK; } -NS_IMETHODIMP +/* virtual */ nsresult nsMathMLmsubFrame::Place (nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize) diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.h index 45ad0c2c776..af3159e2435 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.h @@ -55,7 +55,7 @@ public: NS_IMETHOD TransmitAutomaticData(); - NS_IMETHOD + virtual nsresult Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp index aa33cec9725..dd00eef499d 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp @@ -86,7 +86,7 @@ nsMathMLmsubsupFrame::TransmitAutomaticData() return NS_OK; } -NS_IMETHODIMP +/* virtual */ nsresult nsMathMLmsubsupFrame::Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize) diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.h index 485ec3447f7..37c20ce0837 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.h @@ -55,7 +55,7 @@ public: NS_IMETHOD TransmitAutomaticData(); - NS_IMETHOD + virtual nsresult Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.h index c72394ae220..d209904acdc 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.h @@ -55,7 +55,7 @@ public: NS_IMETHOD TransmitAutomaticData(); - NS_IMETHOD + virtual nsresult Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.cpp index 2ffd7e01674..3484ee579ae 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.cpp @@ -240,7 +240,7 @@ i.e.,: } */ -NS_IMETHODIMP +/* virtual */ nsresult nsMathMLmunderFrame::Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize) diff --git a/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.h index 0126fe70fea..991f11f5204 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.h @@ -52,7 +52,7 @@ class nsMathMLmunderFrame : public nsMathMLContainerFrame { public: friend nsIFrame* NS_NewMathMLmunderFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); - NS_IMETHOD + virtual nsresult Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.cpp index 6e93454cfa2..6ed71e39a10 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.cpp @@ -276,7 +276,7 @@ i.e.,: } */ -NS_IMETHODIMP +/* virtual */ nsresult nsMathMLmunderoverFrame::Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize) diff --git a/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.h index 4456e08fe03..39477dcf90d 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.h @@ -52,7 +52,7 @@ class nsMathMLmunderoverFrame : public nsMathMLContainerFrame { public: friend nsIFrame* NS_NewMathMLmunderoverFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); - NS_IMETHOD + virtual nsresult Place(nsIRenderingContext& aRenderingContext, PRBool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize);