corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PDT+ bug 28341 - Destroy caption frame when outer table frame is destroyed. Add caption to outer frame rather than inner frame. r=troy, a=rickg

Browse Source
This commit is contained in:
karnaze@netscape.com
2000-03-02 06:09:37 +00:00
parent e5f6b3e10d
commit 9c252d135d
9 changed files with 107 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
layout/base/nsCSSFrameConstructor.cpp
View File

@@ -1402,12 +1402,6 @@ nsCSSFrameConstructor::ConstructTableCaptionFrame(nsIPresShell* aPres
nsLayoutAtoms::floaterList,
aState.mFloatedItems.childList);
}
if (outerFrame) {
outerFrame->SetInitialChildList(aPresContext, nsLayoutAtoms::captionList,
aNewCaptionFrame);
}
return rv;
}
@@ -5096,7 +5090,19 @@ nsCSSFrameConstructor::ConstructFrameByDisplayType(nsIPresShell* aPresShell,
// the next 5 cases are only relevant if the parent is not a table, ConstructTableFrame handles children
case NS_STYLE_DISPLAY_TABLE_CAPTION:
{
rv = ConstructTableCaptionFrame(aPresShell, aPresContext, aState, aContent, aParentFrame,
// aParentFrame may be an inner table frame rather than an outer frame
// In this case we need to get the outer frame.
nsIFrame* parentFrame = aParentFrame;
nsIFrame* outerFrame = nsnull;
aParentFrame->GetParent(&outerFrame);
nsCOMPtr<nsIAtom> frameType;
if (outerFrame) {
outerFrame->GetFrameType(getter_AddRefs(frameType));
if (nsLayoutAtoms::tableOuterFrame == frameType.get()) {
parentFrame = outerFrame;
}
}
rv = ConstructTableCaptionFrame(aPresShell, aPresContext, aState, aContent, parentFrame,
aStyleContext, newFrame, ignore, tableCreator);
aFrameItems.AddChild(newFrame);
return rv;