Ongoing deCOMtamination. r+sr=dbaron
git-svn-id: svn://10.0.0.236/trunk@144556 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -133,7 +133,7 @@ nsMathMLmunderFrame::UpdatePresentationDataFromChildAt(nsIPresContext* aPresCont
|
||||
aScriptLevelIncrement, aFlagsValues, aFlagsToUpdate);
|
||||
}
|
||||
index++;
|
||||
childFrame->GetNextSibling(&childFrame);
|
||||
childFrame = childFrame->GetNextSibling();
|
||||
}
|
||||
return NS_OK;
|
||||
|
||||
@@ -179,7 +179,7 @@ XXX The winner is the outermost setting in conflicting settings like these:
|
||||
nsIFrame* underscriptFrame = nsnull;
|
||||
nsIFrame* baseFrame = mFrames.FirstChild();
|
||||
if (baseFrame)
|
||||
baseFrame->GetNextSibling(&underscriptFrame);
|
||||
underscriptFrame = baseFrame->GetNextSibling();
|
||||
if (!baseFrame || !underscriptFrame)
|
||||
return NS_OK; // a visual error indicator will be reported later during layout
|
||||
|
||||
@@ -279,8 +279,8 @@ nsMathMLmunderFrame::Place(nsIPresContext* aPresContext,
|
||||
nsIFrame* underFrame = nsnull;
|
||||
nsIFrame* baseFrame = mFrames.FirstChild();
|
||||
if (baseFrame)
|
||||
baseFrame->GetNextSibling(&underFrame);
|
||||
if (!baseFrame || !underFrame || HasNextSibling(underFrame)) {
|
||||
underFrame = baseFrame->GetNextSibling();
|
||||
if (!baseFrame || !underFrame || underFrame->GetNextSibling()) {
|
||||
// report an error, encourage people to get their markups in order
|
||||
NS_WARNING("invalid markup");
|
||||
return ReflowError(aPresContext, aRenderingContext, aDesiredSize);
|
||||
|
||||
Reference in New Issue
Block a user