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

Reverted back to previous revision, because I came up with a cleaner

Browse Source 
solution


git-svn-id: svn://10.0.0.236/trunk@16645 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com
1998-12-18 05:23:40 +00:00
parent c1c9a2b786
commit 2bada305e0
3 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
View File

@@ -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;

18
mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
View File

@@ -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;

18
mozilla/layout/style/nsHTMLStyleSheet.cpp
View File

@@ -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;