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

Ensure that NS_FRAME_HAS_CHILD_WITH_VIEW is set correctly when something has a view and is inside a float inside the block part of a block-inside-inline split. b=213781 r+sr=bzbarsky

Browse Source
This commit is contained in:
dbaron%dbaron.org 2003-07-25 22:04:00 +00:00
parent b17e39af19
commit 005dd95167
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/base/nsCSSFrameConstructor.cpp
View File

@ -930,9 +930,6 @@ AdjustOutOfFlowFrameParentPtrs(nsIPresContext* aPresContext,
// Update the parent pointer for outOfFlowFrame if it's // Update the parent pointer for outOfFlowFrame if it's
// containing block has changed as the result of reparenting, // containing block has changed as the result of reparenting,
//
// XXX_kin: I don't think we have to worry about
// XXX_kin: NS_STYLE_POSITION_FIXED or NS_STYLE_POSITION_RELATIVE.
if (NS_STYLE_POSITION_ABSOLUTE == display->mPosition) { if (NS_STYLE_POSITION_ABSOLUTE == display->mPosition) {
// XXX_kin: I think we'll need to add code here to handle the // XXX_kin: I think we'll need to add code here to handle the
@ -950,7 +947,15 @@ AdjustOutOfFlowFrameParentPtrs(nsIPresContext* aPresContext,
// XXX_kin: and is also parented to it. // XXX_kin: and is also parented to it.
} }
else if (NS_STYLE_FLOAT_NONE != display->mFloats) { else if (NS_STYLE_FLOAT_NONE != display->mFloats) {
outOfFlowFrame->SetParent(aState->mFloatedItems.containingBlock); nsIFrame *parent = aState->mFloatedItems.containingBlock;
outOfFlowFrame->SetParent(parent);
if (outOfFlowFrame->GetStateBits() &
(NS_FRAME_HAS_VIEW | NS_FRAME_HAS_CHILD_WITH_VIEW)) {
// We don't need to walk up the tree, since each level of
// recursion of the SplitToContainingBlock will propagate the
// bit.
parent->AddStateBits(NS_FRAME_HAS_CHILD_WITH_VIEW);
}
} }
// XXX_kin: We'll need to remove the return below when we support // XXX_kin: We'll need to remove the return below when we support

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

@ -930,9 +930,6 @@ AdjustOutOfFlowFrameParentPtrs(nsIPresContext* aPresContext,
// Update the parent pointer for outOfFlowFrame if it's // Update the parent pointer for outOfFlowFrame if it's
// containing block has changed as the result of reparenting, // containing block has changed as the result of reparenting,
//
// XXX_kin: I don't think we have to worry about
// XXX_kin: NS_STYLE_POSITION_FIXED or NS_STYLE_POSITION_RELATIVE.
if (NS_STYLE_POSITION_ABSOLUTE == display->mPosition) { if (NS_STYLE_POSITION_ABSOLUTE == display->mPosition) {
// XXX_kin: I think we'll need to add code here to handle the // XXX_kin: I think we'll need to add code here to handle the
@ -950,7 +947,15 @@ AdjustOutOfFlowFrameParentPtrs(nsIPresContext* aPresContext,
// XXX_kin: and is also parented to it. // XXX_kin: and is also parented to it.
} }
else if (NS_STYLE_FLOAT_NONE != display->mFloats) { else if (NS_STYLE_FLOAT_NONE != display->mFloats) {
outOfFlowFrame->SetParent(aState->mFloatedItems.containingBlock); nsIFrame *parent = aState->mFloatedItems.containingBlock;
outOfFlowFrame->SetParent(parent);
if (outOfFlowFrame->GetStateBits() &
(NS_FRAME_HAS_VIEW | NS_FRAME_HAS_CHILD_WITH_VIEW)) {
// We don't need to walk up the tree, since each level of
// recursion of the SplitToContainingBlock will propagate the
// bit.
parent->AddStateBits(NS_FRAME_HAS_CHILD_WITH_VIEW);
}
} }
// XXX_kin: We'll need to remove the return below when we support // XXX_kin: We'll need to remove the return below when we support