Fix for bad vertical alignment on replaced object frames, bug 36997 r=dbaron sr=attinasi a=brendan

git-svn-id: svn://10.0.0.236/trunk@110452 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterlubczynski%netscape.com
2001-12-14 03:48:49 +00:00
parent c0882ccfc5
commit f053a6b59e
2 changed files with 16 additions and 4 deletions

View File

@@ -1138,8 +1138,14 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext,
}
// finish up
if (NS_FAILED(rv)) {
// if we got an error, we'll check for alternative content with
// CantRenderReplacedElement()
// if we got an error, we are probably going to be replaced
// for a replaced object frame, clear our vertical alignment style info, see bug 36997
nsStyleTextReset* text = NS_STATIC_CAST(nsStyleTextReset*,
mStyleContext->GetUniqueStyleData(mPresContext, eStyleStruct_TextReset));
text->mVerticalAlign.SetNormalValue();
//check for alternative content with CantRenderReplacedElement()
nsIPresShell* presShell;
aPresContext->GetShell(&presShell);
rv = presShell->CantRenderReplacedElement(aPresContext, this);