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

bug 23994 get the correct child list for a caption frame, r=attinasi

Browse Source
This commit is contained in:
karnaze%netscape.com 2000-02-04 03:16:47 +00:00
parent 932abefdf3
commit 3d970cf36e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/base/nsCSSFrameConstructor.cpp
View File

@ -523,12 +523,11 @@ nsMathMLmtableCreator::CreateTableCellInnerFrame(nsIFrame** aNewFrame)
nsIAtom* GetChildListFor(const nsIFrame* aFrame)
{
nsIAtom* childList = nsnull;
nsIAtom* frameType;
aFrame->GetFrameType(&frameType);
if (nsLayoutAtoms::tableCaptionFrame == frameType) {
nsCOMPtr<nsIAtom> frameType;
aFrame->GetFrameType(getter_AddRefs(frameType));
if (nsLayoutAtoms::tableCaptionFrame == frameType.get()) {
childList = nsLayoutAtoms::captionList;
}
NS_IF_RELEASE(frameType);
return childList;
}
@ -1343,6 +1342,7 @@ nsCSSFrameConstructor::ConstructTableCaptionFrame(nsIPresShell* aPres
PR_FALSE, getter_AddRefs(adjStyleContext));
InitAndRestoreFrame(aPresContext, aState, aContent,
outerFrame, adjStyleContext, nsnull, aNewCaptionFrame);
aState.mFrameManager->SetPrimaryFrameFor(aContent, aNewCaptionFrame);
}
// The caption frame is a floater container
@ -5813,7 +5813,7 @@ nsCSSFrameConstructor::AppendFrames(nsIPresContext* aPresContext,
else {
// Append the frames to the end of the parent's child list
rv = aFrameManager->AppendFrames(aPresContext, *aPresShell, aParentFrame,
nsnull, aFrameList);
GetChildListFor(aFrameList), aFrameList);
}
NS_IF_RELEASE(parentType);

10
layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@ -523,12 +523,11 @@ nsMathMLmtableCreator::CreateTableCellInnerFrame(nsIFrame** aNewFrame)
nsIAtom* GetChildListFor(const nsIFrame* aFrame)
{
nsIAtom* childList = nsnull;
nsIAtom* frameType;
aFrame->GetFrameType(&frameType);
if (nsLayoutAtoms::tableCaptionFrame == frameType) {
nsCOMPtr<nsIAtom> frameType;
aFrame->GetFrameType(getter_AddRefs(frameType));
if (nsLayoutAtoms::tableCaptionFrame == frameType.get()) {
childList = nsLayoutAtoms::captionList;
}
NS_IF_RELEASE(frameType);
return childList;
}
@ -1343,6 +1342,7 @@ nsCSSFrameConstructor::ConstructTableCaptionFrame(nsIPresShell* aPres
PR_FALSE, getter_AddRefs(adjStyleContext));
InitAndRestoreFrame(aPresContext, aState, aContent,
outerFrame, adjStyleContext, nsnull, aNewCaptionFrame);
aState.mFrameManager->SetPrimaryFrameFor(aContent, aNewCaptionFrame);
}
// The caption frame is a floater container
@ -5813,7 +5813,7 @@ nsCSSFrameConstructor::AppendFrames(nsIPresContext* aPresContext,
else {
// Append the frames to the end of the parent's child list
rv = aFrameManager->AppendFrames(aPresContext, *aPresShell, aParentFrame,
nsnull, aFrameList);
GetChildListFor(aFrameList), aFrameList);
}
NS_IF_RELEASE(parentType);