зеркало из https://github.com/mozilla/gecko-dev.git
col frames should not have child frames. bug 230138 r=dbaron sr=bzbarsky
This commit is contained in:
Родитель
75d15492c5
Коммит
cbc9e79487
|
@ -2795,17 +2795,9 @@ nsCSSFrameConstructor::ConstructTableColFrame(nsIPresShell* aPresShel
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!aIsPseudo) {
|
if (!aIsPseudo && aIsPseudoParent) {
|
||||||
nsFrameItems childItems;
|
|
||||||
nsIFrame* captionFrame;
|
|
||||||
rv = TableProcessChildren(aPresShell, aPresContext, aState, aContent, aNewFrame,
|
|
||||||
aTableCreator, childItems, captionFrame);
|
|
||||||
if (NS_FAILED(rv)) return rv;
|
|
||||||
aNewFrame->SetInitialChildList(aPresContext, nsnull, childItems.childList);
|
|
||||||
if (aIsPseudoParent) {
|
|
||||||
aState.mPseudoFrames.mColGroup.mChildList.AddChild(aNewFrame);
|
aState.mPseudoFrames.mColGroup.mChildList.AddChild(aNewFrame);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2795,17 +2795,9 @@ nsCSSFrameConstructor::ConstructTableColFrame(nsIPresShell* aPresShel
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!aIsPseudo) {
|
if (!aIsPseudo && aIsPseudoParent) {
|
||||||
nsFrameItems childItems;
|
|
||||||
nsIFrame* captionFrame;
|
|
||||||
rv = TableProcessChildren(aPresShell, aPresContext, aState, aContent, aNewFrame,
|
|
||||||
aTableCreator, childItems, captionFrame);
|
|
||||||
if (NS_FAILED(rv)) return rv;
|
|
||||||
aNewFrame->SetInitialChildList(aPresContext, nsnull, childItems.childList);
|
|
||||||
if (aIsPseudoParent) {
|
|
||||||
aState.mPseudoFrames.mColGroup.mChildList.AddChild(aNewFrame);
|
aState.mPseudoFrames.mColGroup.mChildList.AddChild(aNewFrame);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче