mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 12:55:46 +00:00
Reverted back to previous revision, because I came up with a cleaner
solution
This commit is contained in:
parent
232cf00fa0
commit
7f566a1613
@ -1386,12 +1386,6 @@ HTMLStyleSheetImpl::ConstructRootFrame(nsIPresContext* aPresContext,
|
||||
nsHTMLContainerFrame::CreateViewForFrame(*aPresContext, pageSequenceFrame,
|
||||
pseudoStyle, PR_TRUE);
|
||||
|
||||
// Add the page sequence frame to the scroll frame. We need to do this
|
||||
// now BEFORE we process the child content, so the view hierarchy is
|
||||
// correct (the scrolling view creates a clip view and widget and inserts
|
||||
// the scrolled frame's view as a child of the clip view)
|
||||
scrollFrame->SetInitialChildList(*aPresContext, nsnull, pageSequenceFrame);
|
||||
|
||||
// Create the first page
|
||||
NS_NewPageFrame(pageFrame);
|
||||
|
||||
@ -1408,6 +1402,9 @@ HTMLStyleSheetImpl::ConstructRootFrame(nsIPresContext* aPresContext,
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
pageFrame->SetInitialChildList(*aPresContext, nsnull, childList);
|
||||
pageSequenceFrame->SetInitialChildList(*aPresContext, nsnull, pageFrame);
|
||||
|
||||
// Set the scroll frame's initial child list
|
||||
scrollFrame->SetInitialChildList(*aPresContext, nsnull, pageSequenceFrame);
|
||||
}
|
||||
|
||||
// Set the root frame's initial child list
|
||||
@ -1464,16 +1461,13 @@ HTMLStyleSheetImpl::ConstructXMLRootDescendants(nsIPresContext* aPresContext,
|
||||
nsHTMLContainerFrame::CreateViewForFrame(*aPresContext, wrapperFrame,
|
||||
scrolledPseudoStyle, PR_TRUE);
|
||||
|
||||
// Set the scroll frame's initial child list. We need to do this now
|
||||
// BEFORE we process the child content, so the view hierarchy is correct
|
||||
// (the scrolling view creates a clip view and widget and inserts the
|
||||
// scrolled frame's view as a child of the clip view)
|
||||
scrollFrame->SetInitialChildList(*aPresContext, nsnull, wrapperFrame);
|
||||
|
||||
// Construct a frame for the document element and process its children
|
||||
nsIFrame* docElementFrame;
|
||||
ConstructFrame(aPresContext, aContent, wrapperFrame, docElementFrame);
|
||||
wrapperFrame->SetInitialChildList(*aPresContext, nsnull, docElementFrame);
|
||||
|
||||
// Set the scroll frame's initial child list
|
||||
scrollFrame->SetInitialChildList(*aPresContext, nsnull, wrapperFrame);
|
||||
}
|
||||
|
||||
aNewFrame = scrollFrame;
|
||||
|
@ -1386,12 +1386,6 @@ HTMLStyleSheetImpl::ConstructRootFrame(nsIPresContext* aPresContext,
|
||||
nsHTMLContainerFrame::CreateViewForFrame(*aPresContext, pageSequenceFrame,
|
||||
pseudoStyle, PR_TRUE);
|
||||
|
||||
// Add the page sequence frame to the scroll frame. We need to do this
|
||||
// now BEFORE we process the child content, so the view hierarchy is
|
||||
// correct (the scrolling view creates a clip view and widget and inserts
|
||||
// the scrolled frame's view as a child of the clip view)
|
||||
scrollFrame->SetInitialChildList(*aPresContext, nsnull, pageSequenceFrame);
|
||||
|
||||
// Create the first page
|
||||
NS_NewPageFrame(pageFrame);
|
||||
|
||||
@ -1408,6 +1402,9 @@ HTMLStyleSheetImpl::ConstructRootFrame(nsIPresContext* aPresContext,
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
pageFrame->SetInitialChildList(*aPresContext, nsnull, childList);
|
||||
pageSequenceFrame->SetInitialChildList(*aPresContext, nsnull, pageFrame);
|
||||
|
||||
// Set the scroll frame's initial child list
|
||||
scrollFrame->SetInitialChildList(*aPresContext, nsnull, pageSequenceFrame);
|
||||
}
|
||||
|
||||
// Set the root frame's initial child list
|
||||
@ -1464,16 +1461,13 @@ HTMLStyleSheetImpl::ConstructXMLRootDescendants(nsIPresContext* aPresContext,
|
||||
nsHTMLContainerFrame::CreateViewForFrame(*aPresContext, wrapperFrame,
|
||||
scrolledPseudoStyle, PR_TRUE);
|
||||
|
||||
// Set the scroll frame's initial child list. We need to do this now
|
||||
// BEFORE we process the child content, so the view hierarchy is correct
|
||||
// (the scrolling view creates a clip view and widget and inserts the
|
||||
// scrolled frame's view as a child of the clip view)
|
||||
scrollFrame->SetInitialChildList(*aPresContext, nsnull, wrapperFrame);
|
||||
|
||||
// Construct a frame for the document element and process its children
|
||||
nsIFrame* docElementFrame;
|
||||
ConstructFrame(aPresContext, aContent, wrapperFrame, docElementFrame);
|
||||
wrapperFrame->SetInitialChildList(*aPresContext, nsnull, docElementFrame);
|
||||
|
||||
// Set the scroll frame's initial child list
|
||||
scrollFrame->SetInitialChildList(*aPresContext, nsnull, wrapperFrame);
|
||||
}
|
||||
|
||||
aNewFrame = scrollFrame;
|
||||
|
@ -1386,12 +1386,6 @@ HTMLStyleSheetImpl::ConstructRootFrame(nsIPresContext* aPresContext,
|
||||
nsHTMLContainerFrame::CreateViewForFrame(*aPresContext, pageSequenceFrame,
|
||||
pseudoStyle, PR_TRUE);
|
||||
|
||||
// Add the page sequence frame to the scroll frame. We need to do this
|
||||
// now BEFORE we process the child content, so the view hierarchy is
|
||||
// correct (the scrolling view creates a clip view and widget and inserts
|
||||
// the scrolled frame's view as a child of the clip view)
|
||||
scrollFrame->SetInitialChildList(*aPresContext, nsnull, pageSequenceFrame);
|
||||
|
||||
// Create the first page
|
||||
NS_NewPageFrame(pageFrame);
|
||||
|
||||
@ -1408,6 +1402,9 @@ HTMLStyleSheetImpl::ConstructRootFrame(nsIPresContext* aPresContext,
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
pageFrame->SetInitialChildList(*aPresContext, nsnull, childList);
|
||||
pageSequenceFrame->SetInitialChildList(*aPresContext, nsnull, pageFrame);
|
||||
|
||||
// Set the scroll frame's initial child list
|
||||
scrollFrame->SetInitialChildList(*aPresContext, nsnull, pageSequenceFrame);
|
||||
}
|
||||
|
||||
// Set the root frame's initial child list
|
||||
@ -1464,16 +1461,13 @@ HTMLStyleSheetImpl::ConstructXMLRootDescendants(nsIPresContext* aPresContext,
|
||||
nsHTMLContainerFrame::CreateViewForFrame(*aPresContext, wrapperFrame,
|
||||
scrolledPseudoStyle, PR_TRUE);
|
||||
|
||||
// Set the scroll frame's initial child list. We need to do this now
|
||||
// BEFORE we process the child content, so the view hierarchy is correct
|
||||
// (the scrolling view creates a clip view and widget and inserts the
|
||||
// scrolled frame's view as a child of the clip view)
|
||||
scrollFrame->SetInitialChildList(*aPresContext, nsnull, wrapperFrame);
|
||||
|
||||
// Construct a frame for the document element and process its children
|
||||
nsIFrame* docElementFrame;
|
||||
ConstructFrame(aPresContext, aContent, wrapperFrame, docElementFrame);
|
||||
wrapperFrame->SetInitialChildList(*aPresContext, nsnull, docElementFrame);
|
||||
|
||||
// Set the scroll frame's initial child list
|
||||
scrollFrame->SetInitialChildList(*aPresContext, nsnull, wrapperFrame);
|
||||
}
|
||||
|
||||
aNewFrame = scrollFrame;
|
||||
|
Loading…
Reference in New Issue
Block a user