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

Fix for bug #8863. Removed some code that was not being used

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@37246 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com
1999-06-28 22:02:06 +00:00
parent f4d2c6ce79
commit d8d34c796f
2 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2207,10 +2207,9 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresContext* aPresContext,
// Create the root frame. The document element's frame is a child of the
// root frame.
//
// Note: the major reason we need the root frame is to implement margins for
// the document element's frame. If we didn't need to support margins on the
// document element's frame, then we could eliminate the root frame and make
// the document element frame a child of the viewport (or its scroll frame)
// The root frame serves two purposes:
// - reserves space for any margins needed for the document element's frame
// - makes sure that the document element's frame covers the entire canvas
nsIFrame* rootFrame;
NS_NewRootFrame(&rootFrame);
@@ -2516,7 +2515,6 @@ nsCSSFrameConstructor::ConstructFrameByTag(nsIPresContext* aPresContext
PRBool canBePositioned = PR_TRUE;
PRBool frameHasBeenInitialized = PR_FALSE;
nsIFrame* newFrame = nsnull; // the frame we construct
PRBool newFrameIsFloaterContainer = PR_FALSE;
PRBool isReplaced = PR_FALSE;
nsresult rv = NS_OK;
@@ -2662,14 +2660,8 @@ nsCSSFrameConstructor::ConstructFrameByTag(nsIPresContext* aPresContext
nsFrameItems childItems;
nsAbsoluteItems floaterList(newFrame);
if (processChildren) {
if (newFrameIsFloaterContainer) {
rv = ProcessChildren(aPresContext, aState, aContent, newFrame,
PR_TRUE, childItems);
}
else {
rv = ProcessChildren(aPresContext, aState, aContent, newFrame,
PR_TRUE, childItems);
}
rv = ProcessChildren(aPresContext, aState, aContent, newFrame,
PR_TRUE, childItems);
}
// Set the frame's initial child list

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

@@ -2207,10 +2207,9 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresContext* aPresContext,
// Create the root frame. The document element's frame is a child of the
// root frame.
//
// Note: the major reason we need the root frame is to implement margins for
// the document element's frame. If we didn't need to support margins on the
// document element's frame, then we could eliminate the root frame and make
// the document element frame a child of the viewport (or its scroll frame)
// The root frame serves two purposes:
// - reserves space for any margins needed for the document element's frame
// - makes sure that the document element's frame covers the entire canvas
nsIFrame* rootFrame;
NS_NewRootFrame(&rootFrame);
@@ -2516,7 +2515,6 @@ nsCSSFrameConstructor::ConstructFrameByTag(nsIPresContext* aPresContext
PRBool canBePositioned = PR_TRUE;
PRBool frameHasBeenInitialized = PR_FALSE;
nsIFrame* newFrame = nsnull; // the frame we construct
PRBool newFrameIsFloaterContainer = PR_FALSE;
PRBool isReplaced = PR_FALSE;
nsresult rv = NS_OK;
@@ -2662,14 +2660,8 @@ nsCSSFrameConstructor::ConstructFrameByTag(nsIPresContext* aPresContext
nsFrameItems childItems;
nsAbsoluteItems floaterList(newFrame);
if (processChildren) {
if (newFrameIsFloaterContainer) {
rv = ProcessChildren(aPresContext, aState, aContent, newFrame,
PR_TRUE, childItems);
}
else {
rv = ProcessChildren(aPresContext, aState, aContent, newFrame,
PR_TRUE, childItems);
}
rv = ProcessChildren(aPresContext, aState, aContent, newFrame,
PR_TRUE, childItems);
}
// Set the frame's initial child list