Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 20:49:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reflow reflow roots and the child of SVG foreignObject with an unconstrained height to avoid triggering page/column breaking. b=366956 r+sr=roc

Browse Source
This commit is contained in:
dbaron%dbaron.org 2007-01-25 02:01:07 +00:00
parent a08ac4ca97
commit c88c6e09b4
8 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
layout/base/nsCSSFrameConstructor.cpp
View File

@ -7326,12 +7326,13 @@ nsCSSFrameConstructor::ConstructSVGFrame(nsFrameConstructorState& aState,
ResolvePseudoStyleFor(aContent,
nsCSSAnonBoxes::mozSVGForeignContent, aStyleContext);
nsIFrame* blockFrame = NS_NewBlockFrame(mPresShell, innerPseudoStyle);
nsIFrame* blockFrame = NS_NewBlockFrame(mPresShell, innerPseudoStyle,
NS_BLOCK_SPACE_MGR |
NS_BLOCK_MARGIN_ROOT |
NS_FRAME_REFLOW_ROOT);
if (NS_UNLIKELY(!blockFrame))
return NS_ERROR_OUT_OF_MEMORY;
blockFrame->AddStateBits(NS_BLOCK_SPACE_MGR | NS_BLOCK_MARGIN_ROOT |
NS_FRAME_REFLOW_ROOT);
// Claim to be relatively positioned so that we end up being the
// absolute containing block.
nsFrameConstructorSaveState saveState;

28
layout/base/nsPresShell.cpp
View File

@ -6046,7 +6046,27 @@ PresShell::ProcessReflowCommands(PRBool aInterruptible)
else
size = target->GetSize();
nsHTMLReflowState reflowState(mPresContext, target, rcx, size);
NS_ASSERTION(!target->GetNextInFlow() && !target->GetPrevInFlow(),
"reflow roots should never split");
// Don't pass size directly to the reflow state, since a
// constrained height implies page/column breaking.
nsHTMLReflowState reflowState(mPresContext, target, rcx,
nsSize(size.width, NS_UNCONSTRAINEDSIZE));
// fix the computed height
NS_ASSERTION(reflowState.mComputedMargin == nsMargin(0, 0, 0, 0),
"reflow state should not set margin for reflow roots");
reflowState.mComputedHeight =
size.height - reflowState.mComputedBorderPadding.TopBottom();
NS_ASSERTION(reflowState.mComputedWidth ==
size.width -
reflowState.mComputedBorderPadding.LeftRight(),
"reflow state computed incorrect width");
// except the viewport frame does want availableHeight set
if (target == root)
reflowState.availableHeight = size.height;
nsReflowStatus status;
target->Reflow(mPresContext, desiredSize, reflowState, status);
@ -6058,6 +6078,12 @@ PresShell::ProcessReflowCommands(PRBool aInterruptible)
desiredSize.height == size.height),
"non-root frame's desired size changed during an "
"incremental reflow");
NS_ASSERTION(desiredSize.mOverflowArea ==
nsRect(nsPoint(0, 0),
nsSize(desiredSize.width, desiredSize.height)),
"reflow roots must not have visible overflow");
NS_ASSERTION(status == NS_FRAME_COMPLETE,
"reflow roots should never split");
target->SetSize(nsSize(desiredSize.width, desiredSize.height));

4
layout/generic/nsViewportFrame.cpp
View File

@ -330,6 +330,10 @@ ViewportFrame::Reflow(nsPresContext* aPresContext,
Invalidate(damageRect, PR_FALSE);
}
// XXX Should we do something to clip our children to this?
aDesiredSize.mOverflowArea =
nsRect(nsPoint(0, 0), nsSize(aDesiredSize.width, aDesiredSize.height));
NS_FRAME_TRACE_REFLOW_OUT("ViewportFrame::Reflow", aStatus);
NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize);
return rv;

14
layout/svg/base/src/nsSVGForeignObjectFrame.cpp
View File

@ -517,11 +517,21 @@ nsSVGForeignObjectFrame::DoReflow()
mInReflow = PR_TRUE;
// create a new reflow state, setting our max size to (width,height):
nsHTMLReflowState reflowState(presContext, kid,
renderingContext, size);
renderingContext,
nsSize(size.width, NS_UNCONSTRAINEDSIZE));
nsHTMLReflowMetrics desiredSize;
nsReflowStatus status;
// We don't use size.height above because that tells the child to do
// page/column breaking at that height.
NS_ASSERTION(reflowState.mComputedBorderPadding == nsMargin(0, 0, 0, 0) &&
reflowState.mComputedMargin == nsMargin(0, 0, 0, 0),
"style system should ensure that :-moz-svg-foreign content "
"does not get styled");
NS_ASSERTION(reflowState.mComputedWidth == size.width,
"reflow state made child wrong size");
reflowState.mComputedHeight = size.height;
ReflowChild(kid, presContext, desiredSize, reflowState, 0, 0,
NS_FRAME_NO_MOVE_FRAME, status);

1
layout/svg/base/src/nsSVGOuterSVGFrame.cpp
View File

@ -709,6 +709,7 @@ nsSVGOuterSVGFrame::CalculateAvailableSpace(nsRect *maxRect,
{
*preferredRect = aPresContext->GetVisibleArea();
// XXXldb What about margin?
if (aReflowState.availableWidth != NS_INTRINSICSIZE)
maxRect->width = aReflowState.availableWidth;
else if (aReflowState.parentReflowState &&

2
layout/svg/base/src/svg.css
View File

@ -72,4 +72,6 @@ foreignObject {
*|*::-moz-svg-foreign-content {
display: block !important;
position: static !important;
/* so we don't report overflow that confuses the reflow root code */
overflow: -moz-hidden-unscrollable ! important;
}

2
layout/xul/base/src/nsBoxFrame.cpp
View File

@ -805,6 +805,8 @@ nsBoxFrame::Reflow(nsPresContext* aPresContext,
nsRect* overflowArea = GetOverflowAreaProperty();
NS_ASSERTION(overflowArea, "Failed to set overflow area property");
aDesiredSize.mOverflowArea = *overflowArea;
} else {
aDesiredSize.mOverflowArea = nsRect(nsPoint(0, 0), GetSize());
}
#ifdef DO_NOISY_REFLOW

2
layout/xul/base/src/nsLeafBoxFrame.cpp
View File

@ -358,6 +358,8 @@ nsLeafBoxFrame::Reflow(nsPresContext* aPresContext,
nsRect* overflowArea = GetOverflowAreaProperty();
NS_ASSERTION(overflowArea, "Failed to set overflow area property");
aDesiredSize.mOverflowArea = *overflowArea;
} else {
aDesiredSize.mOverflowArea = nsRect(nsPoint(0, 0), GetSize());
}
#ifdef DO_NOISY_REFLOW