mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Fix warning with -Wshadow in nsMathMLTokenFrame (about childFrame). (Bug 477962) r=karlt
This commit is contained in:
parent
d65dcf5c80
commit
5761253324
@ -198,15 +198,13 @@ nsMathMLTokenFrame::Place(nsIRenderingContext& aRenderingContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize)
|
||||
{
|
||||
mBoundingMetrics.Clear();
|
||||
nsIFrame* childFrame = GetFirstChild(nsnull);
|
||||
while (childFrame) {
|
||||
for (nsIFrame* childFrame = GetFirstChild(nsnull); childFrame;
|
||||
childFrame = childFrame->GetNextSibling()) {
|
||||
nsHTMLReflowMetrics childSize;
|
||||
GetReflowAndBoundingMetricsFor(childFrame, childSize,
|
||||
childSize.mBoundingMetrics, nsnull);
|
||||
// compute and cache the bounding metrics
|
||||
mBoundingMetrics += childSize.mBoundingMetrics;
|
||||
|
||||
childFrame = childFrame->GetNextSibling();
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIFontMetrics> fm =
|
||||
@ -223,8 +221,8 @@ nsMathMLTokenFrame::Place(nsIRenderingContext& aRenderingContext,
|
||||
|
||||
if (aPlaceOrigin) {
|
||||
nscoord dy, dx = 0;
|
||||
nsIFrame* childFrame = GetFirstChild(nsnull);
|
||||
while (childFrame) {
|
||||
for (nsIFrame* childFrame = GetFirstChild(nsnull); childFrame;
|
||||
childFrame = childFrame->GetNextSibling()) {
|
||||
nsHTMLReflowMetrics childSize;
|
||||
GetReflowAndBoundingMetricsFor(childFrame, childSize,
|
||||
childSize.mBoundingMetrics);
|
||||
@ -233,7 +231,6 @@ nsMathMLTokenFrame::Place(nsIRenderingContext& aRenderingContext,
|
||||
dy = childSize.height == 0 ? 0 : aDesiredSize.ascent - childSize.ascent;
|
||||
FinishReflowChild(childFrame, PresContext(), nsnull, childSize, dx, dy, 0);
|
||||
dx += childSize.width;
|
||||
childFrame = childFrame->GetNextSibling();
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user