Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backout earlier patch for bug 327737 due to regression

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@206526 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rbs%maths.uq.edu.au
2006-08-03 23:27:55 +00:00
parent 88679061a4
commit 82b376e12c
23 changed files with 124 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp
View File

@@ -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);