Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backing out changes.

Browse Source
This commit is contained in:
peterlubczynski%netscape.com 2001-12-14 20:13:50 +00:00
parent 6041493f23
commit 0a752a0976
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/generic/nsObjectFrame.cpp
View File

@ -1138,14 +1138,8 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext,
}
// finish up
if (NS_FAILED(rv)) {
// 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()
// if we got an error, we'll check for alternative content with
// CantRenderReplacedElement()
nsIPresShell* presShell;
aPresContext->GetShell(&presShell);
rv = presShell->CantRenderReplacedElement(aPresContext, this);

10
layout/html/base/src/nsObjectFrame.cpp
View File

@ -1138,14 +1138,8 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext,
}
// finish up
if (NS_FAILED(rv)) {
// 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()
// if we got an error, we'll check for alternative content with
// CantRenderReplacedElement()
nsIPresShell* presShell;
aPresContext->GetShell(&presShell);
rv = presShell->CantRenderReplacedElement(aPresContext, this);