Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed mail/news regression. Code review Saari, Hyatt

Browse Source
This commit is contained in:
evaughan%netscape.com 1999-10-12 20:50:01 +00:00
parent 6584430045
commit 23b60d7a97
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layout/base/nsCSSFrameConstructor.cpp
View File

@ -91,7 +91,8 @@
#include "nsDocument.h"
#include "nsToolbarItemFrame.h"
#define IS_GFX
nsresult
NS_NewDocumentElementFrame ( nsIFrame** aNewFrame );
nsresult
NS_NewThumbFrame ( nsIFrame** aNewFrame );
@ -2152,10 +2153,10 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresContext* aPresCo
PRBool isScrollable = IsScrollable(aPresContext, display);
PRBool isPaginated = PR_FALSE;
aPresContext->IsPaginated(&isPaginated);
nsIFrame* scrollFrame = nsnull;
// build a scrollframe
if (!isPaginated && isScrollable) {
nsIFrame* scrollFrame = nsnull;
nsIStyleContext* childStyle = nsnull;
nsIFrame* newScrollFrame = nsnull;
nsIDocument* document;
@ -2168,7 +2169,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresContext* aPresCo
aParentFrame,
nsLayoutAtoms::scrolledContentPseudo,
document,
aNewFrame,
scrollFrame,
styleContext,
newScrollFrame);
@ -2190,7 +2191,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresContext* aPresCo
NS_NewBoxFrame(&contentFrame);
}
else {
NS_NewAreaFrame(&contentFrame);
NS_NewDocumentElementFrame(&contentFrame);
isBlockFrame = PR_TRUE;
}
@ -2210,10 +2211,14 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresContext* aPresCo
aParentFrame,
contentFrame,
styleContext);
aNewFrame = scrollFrame;
} else {
// if not scrollable the new frame is the content frame.
aNewFrame = contentFrame;
}
mInitialContainingBlock = contentFrame;
aNewFrame = contentFrame;
// if it was a table then we don't need to process our children.
if (!docElemIsTable) {

15
layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@ -91,7 +91,8 @@
#include "nsDocument.h"
#include "nsToolbarItemFrame.h"
#define IS_GFX
nsresult
NS_NewDocumentElementFrame ( nsIFrame** aNewFrame );
nsresult
NS_NewThumbFrame ( nsIFrame** aNewFrame );
@ -2152,10 +2153,10 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresContext* aPresCo
PRBool isScrollable = IsScrollable(aPresContext, display);
PRBool isPaginated = PR_FALSE;
aPresContext->IsPaginated(&isPaginated);
nsIFrame* scrollFrame = nsnull;
// build a scrollframe
if (!isPaginated && isScrollable) {
nsIFrame* scrollFrame = nsnull;
nsIStyleContext* childStyle = nsnull;
nsIFrame* newScrollFrame = nsnull;
nsIDocument* document;
@ -2168,7 +2169,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresContext* aPresCo
aParentFrame,
nsLayoutAtoms::scrolledContentPseudo,
document,
aNewFrame,
scrollFrame,
styleContext,
newScrollFrame);
@ -2190,7 +2191,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresContext* aPresCo
NS_NewBoxFrame(&contentFrame);
}
else {
NS_NewAreaFrame(&contentFrame);
NS_NewDocumentElementFrame(&contentFrame);
isBlockFrame = PR_TRUE;
}
@ -2210,10 +2211,14 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresContext* aPresCo
aParentFrame,
contentFrame,
styleContext);
aNewFrame = scrollFrame;
} else {
// if not scrollable the new frame is the content frame.
aNewFrame = contentFrame;
}
mInitialContainingBlock = contentFrame;
aNewFrame = contentFrame;
// if it was a table then we don't need to process our children.
if (!docElemIsTable) {