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

Fixes crash deleting legend frame. r=rods sr=waterson b=70648

Browse Source
This commit is contained in:
attinasi%netscape.com 2001-05-11 14:26:04 +00:00
parent f9a681041f
commit b696e7f9a5
2 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
layout/forms/nsFieldSetFrame.cpp
View File

@ -616,10 +616,31 @@ nsFieldSetFrame::RemoveFrame(nsIPresContext* aPresContext,
nsIAtom* aListName,
nsIFrame* aOldFrame)
{
return mContentFrame->RemoveFrame (aPresContext,
aPresShell,
aListName,
aOldFrame);
// XXX XXX
// XXX temporary fix for bug 70648
if (aOldFrame == mLegendFrame) {
#ifdef DEBUG
nsIFrame* sibling;
mContentFrame->GetNextSibling(&sibling);
NS_ASSERTION(sibling == mLegendFrame, "legendFrame is not next sibling");
nsIFrame* legendParent;
mLegendFrame->GetParent(&legendParent);
NS_ASSERTION(legendParent == this, "Legend Parent has wrong parent");
#endif
nsIFrame* legendSibling;
sibling->GetNextSibling(&legendSibling);
// replace the legend, which is the next sibling, with any siblings of the legend (XXX always null?)
mContentFrame->SetNextSibling(legendSibling);
// OK, the legend is now removed from the sibling list, but who has ownership of it?
mLegendFrame->Destroy(aPresContext);
mLegendFrame = nsnull;
return NS_OK;
} else {
return mContentFrame->RemoveFrame (aPresContext,
aPresShell,
aListName,
aOldFrame);
}
}

29
layout/html/forms/src/nsFieldSetFrame.cpp
View File

@ -616,10 +616,31 @@ nsFieldSetFrame::RemoveFrame(nsIPresContext* aPresContext,
nsIAtom* aListName,
nsIFrame* aOldFrame)
{
return mContentFrame->RemoveFrame (aPresContext,
aPresShell,
aListName,
aOldFrame);
// XXX XXX
// XXX temporary fix for bug 70648
if (aOldFrame == mLegendFrame) {
#ifdef DEBUG
nsIFrame* sibling;
mContentFrame->GetNextSibling(&sibling);
NS_ASSERTION(sibling == mLegendFrame, "legendFrame is not next sibling");
nsIFrame* legendParent;
mLegendFrame->GetParent(&legendParent);
NS_ASSERTION(legendParent == this, "Legend Parent has wrong parent");
#endif
nsIFrame* legendSibling;
sibling->GetNextSibling(&legendSibling);
// replace the legend, which is the next sibling, with any siblings of the legend (XXX always null?)
mContentFrame->SetNextSibling(legendSibling);
// OK, the legend is now removed from the sibling list, but who has ownership of it?
mLegendFrame->Destroy(aPresContext);
mLegendFrame = nsnull;
return NS_OK;
} else {
return mContentFrame->RemoveFrame (aPresContext,
aPresShell,
aListName,
aOldFrame);
}
}