diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp index c46705bc43e..0daf833cd72 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp @@ -678,7 +678,8 @@ nsMathMLContainerFrame::UpdatePresentationDataFromChildAt(PRInt32 aIndex, } PRInt32 -nsMathMLContainerFrame::FindSmallestFontSizeFor(nsIFrame* aFrame) +nsMathMLContainerFrame::FindSmallestFontSizeFor(nsIPresContext* aPresContext, + nsIFrame* aFrame) { nsStyleFont aFont; nsCOMPtr aStyleContext; @@ -689,10 +690,10 @@ nsMathMLContainerFrame::FindSmallestFontSizeFor(nsIFrame* aFrame) PRInt32 childSize; nsIFrame* childFrame; - aFrame->FirstChild(nsnull, &childFrame); + aFrame->FirstChild(aPresContext, nsnull, &childFrame); while (nsnull != childFrame) { if (!IsOnlyWhitespace(childFrame)) { - childSize = FindSmallestFontSizeFor(childFrame); + childSize = FindSmallestFontSizeFor(aPresContext, childFrame); if (fontSize > childSize) fontSize = childSize; } childFrame->GetNextSibling(&childFrame); @@ -821,7 +822,7 @@ nsMathMLContainerFrame::InsertScriptLevelStyleContext(nsIPresContext* aPresConte PRInt32 smallestFontSize, smallestFontIndex; if (isSmaller) { // find the smallest font-size in this subtree - smallestFontSize = FindSmallestFontSizeFor(childFrame); + smallestFontSize = FindSmallestFontSizeFor(aPresContext, childFrame); } while (0 < gap--) { @@ -1120,7 +1121,7 @@ nsMathMLContainerFrame::ReflowTokenFor(nsIFrame* aFrame, nsBoundingMetrics bm; PRInt32 count = 0; nsIFrame* childFrame; - aFrame->FirstChild(nsnull, &childFrame); + aFrame->FirstChild(aPresContext, nsnull, &childFrame); while (childFrame) { if (IsOnlyWhitespace(childFrame)) { ReflowEmptyChild(aPresContext, childFrame); @@ -1174,7 +1175,7 @@ nsMathMLContainerFrame::PlaceTokenFor(nsIFrame* aFrame, nsRect rect; nsIFrame* childFrame; - aFrame->FirstChild(nsnull, &childFrame); + aFrame->FirstChild(aPresContext, nsnull, &childFrame); while (childFrame) { if (!IsOnlyWhitespace(childFrame)) { childFrame->GetRect(rect); @@ -1190,7 +1191,7 @@ nsMathMLContainerFrame::PlaceTokenFor(nsIFrame* aFrame, nscoord dy; nscoord dx = 0; - aFrame->FirstChild(nsnull, &childFrame); + aFrame->FirstChild(aPresContext, nsnull, &childFrame); while (childFrame) { childFrame->GetRect(rect); diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h index cb9e507eadf..655a589a94b 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h @@ -237,7 +237,8 @@ public: // scriptlevel fonts that lead to unreadable results on deeper nodes below us. // XXX expensive recursive function, need something better, with cache static PRInt32 - FindSmallestFontSizeFor(nsIFrame* aFrame); + FindSmallestFontSizeFor(nsIPresContext* aPresContext, + nsIFrame* aFrame); // helper to check if a frame is an embellished container static PRBool diff --git a/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp index 0751f5c3062..8f9ada6277c 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp @@ -334,7 +334,7 @@ nsMathMLmoFrame::InitData(nsIPresContext* aPresContext) nsIFrame* next = nsnull; nsIFrame* aFrame; - aParent->FirstChild(nsnull, &aFrame); + aParent->FirstChild(aPresContext, nsnull, &aFrame); while (aFrame) { if (aFrame == embellishAncestor) { // we start looking for next state++;