Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

paginate absolutely-positioned elements, b=154892 r+sr=roc a=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@237057 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
fantasai.cvs%inkedblade.net
2007-10-02 05:57:46 +00:00
parent 785b62a055
commit 3a00ff8d0e
26 changed files with 1097 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
mozilla/layout/base/nsCSSFrameConstructor.cpp
View File

@@ -1712,9 +1712,12 @@ static nsIAtom*
GetChildListNameFor(nsIFrame* aChildFrame)
{
nsIAtom* listName;
if (aChildFrame->GetStateBits() & NS_FRAME_IS_OVERFLOW_CONTAINER) {
listName = nsGkAtoms::overflowContainersList;
}
// See if the frame is moved out of the flow
if (aChildFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
else if (aChildFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
// Look at the style information to tell
const nsStyleDisplay* disp = aChildFrame->GetStyleDisplay();
@@ -8102,10 +8105,6 @@ FindPreviousAnonymousSibling(nsIPresShell* aPresShell,
prevSibling = GetLastSpecialSibling(prevSibling);
}
// The frame may have a continuation. If so, we want the
// last continuation as our previous sibling.
prevSibling = prevSibling->GetLastContinuation();
// If the frame is out-of-flow, GPFF() will have returned the
// out-of-flow frame; we want the placeholder.
if (prevSibling->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
@@ -8115,6 +8114,14 @@ FindPreviousAnonymousSibling(nsIPresShell* aPresShell,
prevSibling = placeholderFrame;
}
// The frame may have a continuation. If so, we want the
// last non-overflow-container continuation as our previous sibling.
prevSibling = prevSibling->GetLastContinuation();
while (prevSibling->GetStateBits() & NS_FRAME_IS_OVERFLOW_CONTAINER) {
prevSibling = prevSibling->GetPrevInFlow();
NS_ASSERTION(prevSibling, "first-in-flow can't be overflow container");
}
// Found a previous sibling, we're done!
return prevSibling;
}
@@ -8287,18 +8294,6 @@ nsCSSFrameConstructor::FindPreviousSibling(nsIContent* aContainer,
prevSibling = GetLastSpecialSibling(prevSibling);
}
// The frame may have a continuation. Get the last continuation
prevSibling = prevSibling->GetLastContinuation();
// XXXbz should the IsValidSibling check be after we get the
// placeholder for out-of-flows?
const nsStyleDisplay* display = prevSibling->GetStyleDisplay();
if (aChild && !IsValidSibling(aContainerFrame, prevSibling,
display->mDisplay, (nsIContent&)*aChild,
childDisplay))
continue;
// If the frame is out-of-flow, GPFF() will have returned the
// out-of-flow frame; we want the placeholder.
if (prevSibling->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
@@ -8308,6 +8303,20 @@ nsCSSFrameConstructor::FindPreviousSibling(nsIContent* aContainer,
prevSibling = placeholderFrame;
}
// The frame may have a continuation. if so get the last
// non-overflow-container continuation.
prevSibling = prevSibling->GetLastContinuation();
while (prevSibling->GetStateBits() & NS_FRAME_IS_OVERFLOW_CONTAINER) {
prevSibling = prevSibling->GetPrevInFlow();
NS_ASSERTION(prevSibling, "first-in-flow can't be overflow container");
}
const nsStyleDisplay* display = prevSibling->GetStyleDisplay();
if (aChild && !IsValidSibling(aContainerFrame, prevSibling,
display->mDisplay, (nsIContent&)*aChild,
childDisplay))
continue;
#ifdef DEBUG
nsIFrame* containerFrame = nsnull;
containerFrame = mPresShell->GetPrimaryFrameFor(aContainer);
@@ -9609,7 +9618,8 @@ UpdateViewsForTree(nsIFrame* aFrame, nsIViewManager* aViewManager,
do {
nsIFrame* child = aFrame->GetFirstChild(childList);
while (child) {
if (!(child->GetStateBits() & NS_FRAME_OUT_OF_FLOW)) {
if (!(child->GetStateBits() & NS_FRAME_OUT_OF_FLOW)
|| (child->GetStateBits() & NS_FRAME_IS_OVERFLOW_CONTAINER)) {
// only do frames that are in flow
if (nsGkAtoms::placeholderFrame == child->GetType()) { // placeholder
// get out of flow frame and start over there
@@ -9781,8 +9791,11 @@ nsCSSFrameConstructor::StyleChangeReflow(nsIFrame* aFrame)
if (IsFrameSpecial(aFrame))
aFrame = GetIBContainingBlockFor(aFrame);
mPresShell->FrameNeedsReflow(aFrame, nsIPresShell::eStyleChange,
NS_FRAME_IS_DIRTY);
do {
mPresShell->FrameNeedsReflow(aFrame, nsIPresShell::eStyleChange,
NS_FRAME_IS_DIRTY);
aFrame = aFrame->GetNextContinuation();
} while (aFrame);
return NS_OK;
}
@@ -10562,6 +10575,11 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext* aPresContext,
newFrame->AddStateBits(NS_FRAME_GENERATED_CONTENT);
}
// A continuation of an out-of-flow is also an out-of-flow
if (aFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
newFrame->AddStateBits(NS_FRAME_OUT_OF_FLOW);
}
if (nextInFlow) {
nextInFlow->SetPrevInFlow(newFrame);
newFrame->SetNextInFlow(nextInFlow);